Merge `master` 0.13.2 into `develop` by UdjinM6 · Pull Request #2775 · dashpay/dash

UdjinM6 · 2019-03-15T13:13:13Z

This basically updates release notes (#2689, #2749, #2769) and chainparams (#2750) while ignoring client version bumps (#2686, #2749) and temporary litemode fix (#2694). Everything else is backports from develop to master which are merged back automagically with no changes.

Reproducible via git checkout develop && git checkout -b somebranch && git merge --no-ff master and resolving conflict the way it's described above.

…y#2627)

…ashpay#2649) * Adjust help text of `register*` rpc commands Copy/paste help for various fields of `register`/`register_prepare` instead of referring to `register_fund` Adjust description of provided functionality and expected results * Adjust whitespaces to match in different protx commands * Add missing results descriptions * Introduce new helper function GetHelpString to concentrate most of param descriptions in rpcevo in one place * [MOVEONLY] Move GetHelpString out of #ifdef ENABLE_WALLET/#endif * static const

…cific way (dashpay#2652) Benchmark Dash part while at it

…#2673) Otherwise duplicate-keys checks for deterministic masternodes triggers for duplicate/identical transactions.

[0.13.x] Backport multiple PRs from develop

* Add getspecialtxes rpc Returns an array of special transactions found in the specified block * small help text tweak * add comments

Otherwise we might end up passing and invalid proTx into it, causing assertions to fail and thus crash the process.

…stsProviderTxConflict` (dashpay#2691) * Invalid ProTxes should never reach addUnchecked * Invalid ProTxes should not cause existsProviderTxConflict to crash

[0.13.x] Backport multiple PRs from develop

* Release notes v0.13.1.0 * Add a note about no proto bump * update * Add a note about downgrading to 0.13.0.0 * 0.13.0.0->0.13.1.0 Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

…tInfoString (dashpay#2687) 8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake) Pull request description: As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`: <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png"> This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e: <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png"> Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea

…on (dashpay#2698) * Do not process blocks in CDeterministicMNManager before dip3 activation This should save us some cpu/disk on initial sync/reindex * Write initial snapshot on dip3 activation

…otx diff" (dashpay#2699) * Fix incorrect usage of begin() when genesis block is requested in "protx diff" .begin() on mapBlockIndex does NOT return the genesis block, but just the block with lowest hash. The fix is to use chainActive[0] to get the genesis block. * Update src/evo/simplifiedmns.cpp Co-Authored-By: codablock <ablock84@gmail.com>

It was reported on iOS that CMerkleBlock sometimes included the dummy quorum commitments introduced with v13, which led to banning of nodes as these were not supported/expected there. We should in general only include TXs here that are of interest for SPV nodes, so we should maintain the list of allowed TX types.

…2740)

…ashes (dashpay#2744) * Let Commit() return void The boolean return value will loose its meaning in the next commit * Implement 2-stage commits for CDBTransaction and CScopedDBTransaction CDBTransaction is changed to allow CDBBatch, CDBWrapper and other CDBTransactions as parent instead of just CDBWrapper. This in turn allows to implement multi-staged commits in CEvoDB. We now have the "current transaction" which is started and ended (commit or rollback) for each call to Connect-/DisconnectBlock. When the current transaction is committed, it moves its contents into the "root transaction" instead of directly writing to CDBWrapper. CommitRootTransaction() then handles the final commitment to CDBWrapper. It is called at the same time when the chainstate is flushed to disk, which guarantees consistency between chainstate and CEvoDB. * Allow to efficiently move values into parent transactions to avoid copies When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid copying values from this transaction to the parent transaction and instead pass values by rvalue and let the contents be moved. * Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)" This reverts commit 6dfceab.

…ay#2745)

[0.13.x] Backport multiple PRs from develop

* Bump version to 0.13.2 * Add release notes for 0.13.2.0 * Update credits * Add dashpay#2750 to changelog * Update doc/release-notes.md Co-Authored-By: codablock <ablock84@gmail.com>

Also move "Bump version to 0.13.2" to other

Resolved conflicts: configure.ac doc/Doxyfile doc/guide-startmany.md src/clientversion.h src/evo/deterministicmns.cpp src/evo/providertx.cpp src/qt/masternodelist.cpp src/qt/masternodelist.h src/rpc/masternode.cpp src/rpc/rpcevo.cpp src/validation.cpp

codablock

utACK (even though I'm still in favor of ditching this by git-flow inspired workflow :P)

UdjinM6 · 2019-03-15T13:13:13Z

This basically updates release notes (#2689, #2749, #2769) and chainparams (#2750) while ignoring client version bumps (#2686, #2749) and temporary litemode fix (#2694). Everything else is backports from develop to master which are merged back automagically with no changes.

Reproducible via git checkout develop && git checkout -b somebranch && git merge --no-ff master and resolving conflict the way it's described above.

…y#2627)

…ashpay#2649) * Adjust help text of `register*` rpc commands Copy/paste help for various fields of `register`/`register_prepare` instead of referring to `register_fund` Adjust description of provided functionality and expected results * Adjust whitespaces to match in different protx commands * Add missing results descriptions * Introduce new helper function GetHelpString to concentrate most of param descriptions in rpcevo in one place * [MOVEONLY] Move GetHelpString out of #ifdef ENABLE_WALLET/#endif * static const

…cific way (dashpay#2652) Benchmark Dash part while at it

…#2673) Otherwise duplicate-keys checks for deterministic masternodes triggers for duplicate/identical transactions.

[0.13.x] Backport multiple PRs from develop

* Add getspecialtxes rpc Returns an array of special transactions found in the specified block * small help text tweak * add comments

Otherwise we might end up passing and invalid proTx into it, causing assertions to fail and thus crash the process.

…stsProviderTxConflict` (dashpay#2691) * Invalid ProTxes should never reach addUnchecked * Invalid ProTxes should not cause existsProviderTxConflict to crash

[0.13.x] Backport multiple PRs from develop

* Release notes v0.13.1.0 * Add a note about no proto bump * update * Add a note about downgrading to 0.13.0.0 * 0.13.0.0->0.13.1.0 Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

…tInfoString (dashpay#2687) 8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake) Pull request description: As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`: <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png"> This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e: <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png"> Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea

…on (dashpay#2698) * Do not process blocks in CDeterministicMNManager before dip3 activation This should save us some cpu/disk on initial sync/reindex * Write initial snapshot on dip3 activation

…otx diff" (dashpay#2699) * Fix incorrect usage of begin() when genesis block is requested in "protx diff" .begin() on mapBlockIndex does NOT return the genesis block, but just the block with lowest hash. The fix is to use chainActive[0] to get the genesis block. * Update src/evo/simplifiedmns.cpp Co-Authored-By: codablock <ablock84@gmail.com>

It was reported on iOS that CMerkleBlock sometimes included the dummy quorum commitments introduced with v13, which led to banning of nodes as these were not supported/expected there. We should in general only include TXs here that are of interest for SPV nodes, so we should maintain the list of allowed TX types.

…2740)

…ashes (dashpay#2744) * Let Commit() return void The boolean return value will loose its meaning in the next commit * Implement 2-stage commits for CDBTransaction and CScopedDBTransaction CDBTransaction is changed to allow CDBBatch, CDBWrapper and other CDBTransactions as parent instead of just CDBWrapper. This in turn allows to implement multi-staged commits in CEvoDB. We now have the "current transaction" which is started and ended (commit or rollback) for each call to Connect-/DisconnectBlock. When the current transaction is committed, it moves its contents into the "root transaction" instead of directly writing to CDBWrapper. CommitRootTransaction() then handles the final commitment to CDBWrapper. It is called at the same time when the chainstate is flushed to disk, which guarantees consistency between chainstate and CEvoDB. * Allow to efficiently move values into parent transactions to avoid copies When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid copying values from this transaction to the parent transaction and instead pass values by rvalue and let the contents be moved. * Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)" This reverts commit 6dfceab.

…ay#2745)

[0.13.x] Backport multiple PRs from develop

* Bump version to 0.13.2 * Add release notes for 0.13.2.0 * Update credits * Add dashpay#2750 to changelog * Update doc/release-notes.md Co-Authored-By: codablock <ablock84@gmail.com>

Also move "Bump version to 0.13.2" to other

Resolved conflicts: configure.ac doc/Doxyfile doc/guide-startmany.md src/clientversion.h src/evo/deterministicmns.cpp src/evo/providertx.cpp src/qt/masternodelist.cpp src/qt/masternodelist.h src/rpc/masternode.cpp src/rpc/rpcevo.cpp src/validation.cpp

codablock

utACK (even though I'm still in favor of ditching this by git-flow inspired workflow :P)

UdjinM6 · 2019-03-15T13:13:13Z

This basically updates release notes (#2689, #2749, #2769) and chainparams (#2750) while ignoring client version bumps (#2686, #2749) and temporary litemode fix (#2694). Everything else is backports from develop to master which are merged back automagically with no changes.

Reproducible via git checkout develop && git checkout -b somebranch && git merge --no-ff master and resolving conflict the way it's described above.

…y#2627)

…ashpay#2649) * Adjust help text of `register*` rpc commands Copy/paste help for various fields of `register`/`register_prepare` instead of referring to `register_fund` Adjust description of provided functionality and expected results * Adjust whitespaces to match in different protx commands * Add missing results descriptions * Introduce new helper function GetHelpString to concentrate most of param descriptions in rpcevo in one place * [MOVEONLY] Move GetHelpString out of #ifdef ENABLE_WALLET/#endif * static const

…cific way (dashpay#2652) Benchmark Dash part while at it

…#2673) Otherwise duplicate-keys checks for deterministic masternodes triggers for duplicate/identical transactions.

[0.13.x] Backport multiple PRs from develop

* Add getspecialtxes rpc Returns an array of special transactions found in the specified block * small help text tweak * add comments

Otherwise we might end up passing and invalid proTx into it, causing assertions to fail and thus crash the process.

…stsProviderTxConflict` (dashpay#2691) * Invalid ProTxes should never reach addUnchecked * Invalid ProTxes should not cause existsProviderTxConflict to crash

[0.13.x] Backport multiple PRs from develop

* Release notes v0.13.1.0 * Add a note about no proto bump * update * Add a note about downgrading to 0.13.0.0 * 0.13.0.0->0.13.1.0 Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

…tInfoString (dashpay#2687) 8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake) Pull request description: As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`: <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png"> This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e: <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png"> Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea

…on (dashpay#2698) * Do not process blocks in CDeterministicMNManager before dip3 activation This should save us some cpu/disk on initial sync/reindex * Write initial snapshot on dip3 activation

…otx diff" (dashpay#2699) * Fix incorrect usage of begin() when genesis block is requested in "protx diff" .begin() on mapBlockIndex does NOT return the genesis block, but just the block with lowest hash. The fix is to use chainActive[0] to get the genesis block. * Update src/evo/simplifiedmns.cpp Co-Authored-By: codablock <ablock84@gmail.com>

It was reported on iOS that CMerkleBlock sometimes included the dummy quorum commitments introduced with v13, which led to banning of nodes as these were not supported/expected there. We should in general only include TXs here that are of interest for SPV nodes, so we should maintain the list of allowed TX types.

…2740)

…ashes (dashpay#2744) * Let Commit() return void The boolean return value will loose its meaning in the next commit * Implement 2-stage commits for CDBTransaction and CScopedDBTransaction CDBTransaction is changed to allow CDBBatch, CDBWrapper and other CDBTransactions as parent instead of just CDBWrapper. This in turn allows to implement multi-staged commits in CEvoDB. We now have the "current transaction" which is started and ended (commit or rollback) for each call to Connect-/DisconnectBlock. When the current transaction is committed, it moves its contents into the "root transaction" instead of directly writing to CDBWrapper. CommitRootTransaction() then handles the final commitment to CDBWrapper. It is called at the same time when the chainstate is flushed to disk, which guarantees consistency between chainstate and CEvoDB. * Allow to efficiently move values into parent transactions to avoid copies When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid copying values from this transaction to the parent transaction and instead pass values by rvalue and let the contents be moved. * Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)" This reverts commit 6dfceab.

…ay#2745)

[0.13.x] Backport multiple PRs from develop

* Bump version to 0.13.2 * Add release notes for 0.13.2.0 * Update credits * Add dashpay#2750 to changelog * Update doc/release-notes.md Co-Authored-By: codablock <ablock84@gmail.com>

Also move "Bump version to 0.13.2" to other

Resolved conflicts: configure.ac doc/Doxyfile doc/guide-startmany.md src/clientversion.h src/evo/deterministicmns.cpp src/evo/providertx.cpp src/qt/masternodelist.cpp src/qt/masternodelist.h src/rpc/masternode.cpp src/rpc/rpcevo.cpp src/validation.cpp

codablock

utACK (even though I'm still in favor of ditching this by git-flow inspired workflow :P)

UdjinM6 · 2019-03-15T13:13:13Z

This basically updates release notes (#2689, #2749, #2769) and chainparams (#2750) while ignoring client version bumps (#2686, #2749) and temporary litemode fix (#2694). Everything else is backports from develop to master which are merged back automagically with no changes.

Reproducible via git checkout develop && git checkout -b somebranch && git merge --no-ff master and resolving conflict the way it's described above.

…y#2627)

…ashpay#2649) * Adjust help text of `register*` rpc commands Copy/paste help for various fields of `register`/`register_prepare` instead of referring to `register_fund` Adjust description of provided functionality and expected results * Adjust whitespaces to match in different protx commands * Add missing results descriptions * Introduce new helper function GetHelpString to concentrate most of param descriptions in rpcevo in one place * [MOVEONLY] Move GetHelpString out of #ifdef ENABLE_WALLET/#endif * static const

…cific way (dashpay#2652) Benchmark Dash part while at it

…#2673) Otherwise duplicate-keys checks for deterministic masternodes triggers for duplicate/identical transactions.

[0.13.x] Backport multiple PRs from develop

* Add getspecialtxes rpc Returns an array of special transactions found in the specified block * small help text tweak * add comments

Otherwise we might end up passing and invalid proTx into it, causing assertions to fail and thus crash the process.

…stsProviderTxConflict` (dashpay#2691) * Invalid ProTxes should never reach addUnchecked * Invalid ProTxes should not cause existsProviderTxConflict to crash

[0.13.x] Backport multiple PRs from develop

* Release notes v0.13.1.0 * Add a note about no proto bump * update * Add a note about downgrading to 0.13.0.0 * 0.13.0.0->0.13.1.0 Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

…tInfoString (dashpay#2687) 8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake) Pull request description: As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`: <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png"> This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e: <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png"> Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea

…on (dashpay#2698) * Do not process blocks in CDeterministicMNManager before dip3 activation This should save us some cpu/disk on initial sync/reindex * Write initial snapshot on dip3 activation

…otx diff" (dashpay#2699) * Fix incorrect usage of begin() when genesis block is requested in "protx diff" .begin() on mapBlockIndex does NOT return the genesis block, but just the block with lowest hash. The fix is to use chainActive[0] to get the genesis block. * Update src/evo/simplifiedmns.cpp Co-Authored-By: codablock <ablock84@gmail.com>

It was reported on iOS that CMerkleBlock sometimes included the dummy quorum commitments introduced with v13, which led to banning of nodes as these were not supported/expected there. We should in general only include TXs here that are of interest for SPV nodes, so we should maintain the list of allowed TX types.

…2740)

…ashes (dashpay#2744) * Let Commit() return void The boolean return value will loose its meaning in the next commit * Implement 2-stage commits for CDBTransaction and CScopedDBTransaction CDBTransaction is changed to allow CDBBatch, CDBWrapper and other CDBTransactions as parent instead of just CDBWrapper. This in turn allows to implement multi-staged commits in CEvoDB. We now have the "current transaction" which is started and ended (commit or rollback) for each call to Connect-/DisconnectBlock. When the current transaction is committed, it moves its contents into the "root transaction" instead of directly writing to CDBWrapper. CommitRootTransaction() then handles the final commitment to CDBWrapper. It is called at the same time when the chainstate is flushed to disk, which guarantees consistency between chainstate and CEvoDB. * Allow to efficiently move values into parent transactions to avoid copies When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid copying values from this transaction to the parent transaction and instead pass values by rvalue and let the contents be moved. * Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)" This reverts commit 6dfceab.

…ay#2745)

[0.13.x] Backport multiple PRs from develop

* Bump version to 0.13.2 * Add release notes for 0.13.2.0 * Update credits * Add dashpay#2750 to changelog * Update doc/release-notes.md Co-Authored-By: codablock <ablock84@gmail.com>

Also move "Bump version to 0.13.2" to other

Resolved conflicts: configure.ac doc/Doxyfile doc/guide-startmany.md src/clientversion.h src/evo/deterministicmns.cpp src/evo/providertx.cpp src/qt/masternodelist.cpp src/qt/masternodelist.h src/rpc/masternode.cpp src/rpc/rpcevo.cpp src/validation.cpp

codablock

utACK (even though I'm still in favor of ditching this by git-flow inspired workflow :P)

UdjinM6 · 2019-03-15T13:13:13Z

This basically updates release notes (#2689, #2749, #2769) and chainparams (#2750) while ignoring client version bumps (#2686, #2749) and temporary litemode fix (#2694). Everything else is backports from develop to master which are merged back automagically with no changes.

Reproducible via git checkout develop && git checkout -b somebranch && git merge --no-ff master and resolving conflict the way it's described above.

…y#2627)

…ashpay#2649) * Adjust help text of `register*` rpc commands Copy/paste help for various fields of `register`/`register_prepare` instead of referring to `register_fund` Adjust description of provided functionality and expected results * Adjust whitespaces to match in different protx commands * Add missing results descriptions * Introduce new helper function GetHelpString to concentrate most of param descriptions in rpcevo in one place * [MOVEONLY] Move GetHelpString out of #ifdef ENABLE_WALLET/#endif * static const

…cific way (dashpay#2652) Benchmark Dash part while at it

…#2673) Otherwise duplicate-keys checks for deterministic masternodes triggers for duplicate/identical transactions.

[0.13.x] Backport multiple PRs from develop

* Add getspecialtxes rpc Returns an array of special transactions found in the specified block * small help text tweak * add comments

Otherwise we might end up passing and invalid proTx into it, causing assertions to fail and thus crash the process.

…stsProviderTxConflict` (dashpay#2691) * Invalid ProTxes should never reach addUnchecked * Invalid ProTxes should not cause existsProviderTxConflict to crash

[0.13.x] Backport multiple PRs from develop

* Release notes v0.13.1.0 * Add a note about no proto bump * update * Add a note about downgrading to 0.13.0.0 * 0.13.0.0->0.13.1.0 Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

…tInfoString (dashpay#2687) 8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake) Pull request description: As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`: <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png"> This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e: <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png"> Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea

…on (dashpay#2698) * Do not process blocks in CDeterministicMNManager before dip3 activation This should save us some cpu/disk on initial sync/reindex * Write initial snapshot on dip3 activation

…otx diff" (dashpay#2699) * Fix incorrect usage of begin() when genesis block is requested in "protx diff" .begin() on mapBlockIndex does NOT return the genesis block, but just the block with lowest hash. The fix is to use chainActive[0] to get the genesis block. * Update src/evo/simplifiedmns.cpp Co-Authored-By: codablock <ablock84@gmail.com>

It was reported on iOS that CMerkleBlock sometimes included the dummy quorum commitments introduced with v13, which led to banning of nodes as these were not supported/expected there. We should in general only include TXs here that are of interest for SPV nodes, so we should maintain the list of allowed TX types.

…2740)

…ashes (dashpay#2744) * Let Commit() return void The boolean return value will loose its meaning in the next commit * Implement 2-stage commits for CDBTransaction and CScopedDBTransaction CDBTransaction is changed to allow CDBBatch, CDBWrapper and other CDBTransactions as parent instead of just CDBWrapper. This in turn allows to implement multi-staged commits in CEvoDB. We now have the "current transaction" which is started and ended (commit or rollback) for each call to Connect-/DisconnectBlock. When the current transaction is committed, it moves its contents into the "root transaction" instead of directly writing to CDBWrapper. CommitRootTransaction() then handles the final commitment to CDBWrapper. It is called at the same time when the chainstate is flushed to disk, which guarantees consistency between chainstate and CEvoDB. * Allow to efficiently move values into parent transactions to avoid copies When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid copying values from this transaction to the parent transaction and instead pass values by rvalue and let the contents be moved. * Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)" This reverts commit 6dfceab.

…ay#2745)

[0.13.x] Backport multiple PRs from develop

* Bump version to 0.13.2 * Add release notes for 0.13.2.0 * Update credits * Add dashpay#2750 to changelog * Update doc/release-notes.md Co-Authored-By: codablock <ablock84@gmail.com>

Also move "Bump version to 0.13.2" to other

Resolved conflicts: configure.ac doc/Doxyfile doc/guide-startmany.md src/clientversion.h src/evo/deterministicmns.cpp src/evo/providertx.cpp src/qt/masternodelist.cpp src/qt/masternodelist.h src/rpc/masternode.cpp src/rpc/rpcevo.cpp src/validation.cpp

codablock

utACK (even though I'm still in favor of ditching this by git-flow inspired workflow :P)

UdjinM6 · 2019-03-15T13:13:13Z

This basically updates release notes (#2689, #2749, #2769) and chainparams (#2750) while ignoring client version bumps (#2686, #2749) and temporary litemode fix (#2694). Everything else is backports from develop to master which are merged back automagically with no changes.

Reproducible via git checkout develop && git checkout -b somebranch && git merge --no-ff master and resolving conflict the way it's described above.

…y#2627)

…ashpay#2649) * Adjust help text of `register*` rpc commands Copy/paste help for various fields of `register`/`register_prepare` instead of referring to `register_fund` Adjust description of provided functionality and expected results * Adjust whitespaces to match in different protx commands * Add missing results descriptions * Introduce new helper function GetHelpString to concentrate most of param descriptions in rpcevo in one place * [MOVEONLY] Move GetHelpString out of #ifdef ENABLE_WALLET/#endif * static const

…cific way (dashpay#2652) Benchmark Dash part while at it

…#2673) Otherwise duplicate-keys checks for deterministic masternodes triggers for duplicate/identical transactions.

[0.13.x] Backport multiple PRs from develop

* Add getspecialtxes rpc Returns an array of special transactions found in the specified block * small help text tweak * add comments

Otherwise we might end up passing and invalid proTx into it, causing assertions to fail and thus crash the process.

…stsProviderTxConflict` (dashpay#2691) * Invalid ProTxes should never reach addUnchecked * Invalid ProTxes should not cause existsProviderTxConflict to crash

[0.13.x] Backport multiple PRs from develop

* Release notes v0.13.1.0 * Add a note about no proto bump * update * Add a note about downgrading to 0.13.0.0 * 0.13.0.0->0.13.1.0 Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

…tInfoString (dashpay#2687) 8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake) Pull request description: As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`: <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png"> This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e: <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png"> Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea

…on (dashpay#2698) * Do not process blocks in CDeterministicMNManager before dip3 activation This should save us some cpu/disk on initial sync/reindex * Write initial snapshot on dip3 activation

…otx diff" (dashpay#2699) * Fix incorrect usage of begin() when genesis block is requested in "protx diff" .begin() on mapBlockIndex does NOT return the genesis block, but just the block with lowest hash. The fix is to use chainActive[0] to get the genesis block. * Update src/evo/simplifiedmns.cpp Co-Authored-By: codablock <ablock84@gmail.com>

It was reported on iOS that CMerkleBlock sometimes included the dummy quorum commitments introduced with v13, which led to banning of nodes as these were not supported/expected there. We should in general only include TXs here that are of interest for SPV nodes, so we should maintain the list of allowed TX types.

…2740)

…ashes (dashpay#2744) * Let Commit() return void The boolean return value will loose its meaning in the next commit * Implement 2-stage commits for CDBTransaction and CScopedDBTransaction CDBTransaction is changed to allow CDBBatch, CDBWrapper and other CDBTransactions as parent instead of just CDBWrapper. This in turn allows to implement multi-staged commits in CEvoDB. We now have the "current transaction" which is started and ended (commit or rollback) for each call to Connect-/DisconnectBlock. When the current transaction is committed, it moves its contents into the "root transaction" instead of directly writing to CDBWrapper. CommitRootTransaction() then handles the final commitment to CDBWrapper. It is called at the same time when the chainstate is flushed to disk, which guarantees consistency between chainstate and CEvoDB. * Allow to efficiently move values into parent transactions to avoid copies When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid copying values from this transaction to the parent transaction and instead pass values by rvalue and let the contents be moved. * Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)" This reverts commit 6dfceab.

…ay#2745)

[0.13.x] Backport multiple PRs from develop

* Bump version to 0.13.2 * Add release notes for 0.13.2.0 * Update credits * Add dashpay#2750 to changelog * Update doc/release-notes.md Co-Authored-By: codablock <ablock84@gmail.com>

Also move "Bump version to 0.13.2" to other

Resolved conflicts: configure.ac doc/Doxyfile doc/guide-startmany.md src/clientversion.h src/evo/deterministicmns.cpp src/evo/providertx.cpp src/qt/masternodelist.cpp src/qt/masternodelist.h src/rpc/masternode.cpp src/rpc/rpcevo.cpp src/validation.cpp

codablock

utACK (even though I'm still in favor of ditching this by git-flow inspired workflow :P)

UdjinM6 · 2019-03-15T13:13:13Z

This basically updates release notes (#2689, #2749, #2769) and chainparams (#2750) while ignoring client version bumps (#2686, #2749) and temporary litemode fix (#2694). Everything else is backports from develop to master which are merged back automagically with no changes.

Reproducible via git checkout develop && git checkout -b somebranch && git merge --no-ff master and resolving conflict the way it's described above.

…y#2627)

…ashpay#2649) * Adjust help text of `register*` rpc commands Copy/paste help for various fields of `register`/`register_prepare` instead of referring to `register_fund` Adjust description of provided functionality and expected results * Adjust whitespaces to match in different protx commands * Add missing results descriptions * Introduce new helper function GetHelpString to concentrate most of param descriptions in rpcevo in one place * [MOVEONLY] Move GetHelpString out of #ifdef ENABLE_WALLET/#endif * static const

…cific way (dashpay#2652) Benchmark Dash part while at it

…#2673) Otherwise duplicate-keys checks for deterministic masternodes triggers for duplicate/identical transactions.

[0.13.x] Backport multiple PRs from develop

* Add getspecialtxes rpc Returns an array of special transactions found in the specified block * small help text tweak * add comments

Otherwise we might end up passing and invalid proTx into it, causing assertions to fail and thus crash the process.

…stsProviderTxConflict` (dashpay#2691) * Invalid ProTxes should never reach addUnchecked * Invalid ProTxes should not cause existsProviderTxConflict to crash

[0.13.x] Backport multiple PRs from develop

* Release notes v0.13.1.0 * Add a note about no proto bump * update * Add a note about downgrading to 0.13.0.0 * 0.13.0.0->0.13.1.0 Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

…tInfoString (dashpay#2687) 8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake) Pull request description: As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`: <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png"> This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e: <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png"> Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea

…on (dashpay#2698) * Do not process blocks in CDeterministicMNManager before dip3 activation This should save us some cpu/disk on initial sync/reindex * Write initial snapshot on dip3 activation

…otx diff" (dashpay#2699) * Fix incorrect usage of begin() when genesis block is requested in "protx diff" .begin() on mapBlockIndex does NOT return the genesis block, but just the block with lowest hash. The fix is to use chainActive[0] to get the genesis block. * Update src/evo/simplifiedmns.cpp Co-Authored-By: codablock <ablock84@gmail.com>

It was reported on iOS that CMerkleBlock sometimes included the dummy quorum commitments introduced with v13, which led to banning of nodes as these were not supported/expected there. We should in general only include TXs here that are of interest for SPV nodes, so we should maintain the list of allowed TX types.

…2740)

…ashes (dashpay#2744) * Let Commit() return void The boolean return value will loose its meaning in the next commit * Implement 2-stage commits for CDBTransaction and CScopedDBTransaction CDBTransaction is changed to allow CDBBatch, CDBWrapper and other CDBTransactions as parent instead of just CDBWrapper. This in turn allows to implement multi-staged commits in CEvoDB. We now have the "current transaction" which is started and ended (commit or rollback) for each call to Connect-/DisconnectBlock. When the current transaction is committed, it moves its contents into the "root transaction" instead of directly writing to CDBWrapper. CommitRootTransaction() then handles the final commitment to CDBWrapper. It is called at the same time when the chainstate is flushed to disk, which guarantees consistency between chainstate and CEvoDB. * Allow to efficiently move values into parent transactions to avoid copies When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid copying values from this transaction to the parent transaction and instead pass values by rvalue and let the contents be moved. * Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)" This reverts commit 6dfceab.

…ay#2745)

[0.13.x] Backport multiple PRs from develop

* Bump version to 0.13.2 * Add release notes for 0.13.2.0 * Update credits * Add dashpay#2750 to changelog * Update doc/release-notes.md Co-Authored-By: codablock <ablock84@gmail.com>

Also move "Bump version to 0.13.2" to other

Resolved conflicts: configure.ac doc/Doxyfile doc/guide-startmany.md src/clientversion.h src/evo/deterministicmns.cpp src/evo/providertx.cpp src/qt/masternodelist.cpp src/qt/masternodelist.h src/rpc/masternode.cpp src/rpc/rpcevo.cpp src/validation.cpp

codablock

utACK (even though I'm still in favor of ditching this by git-flow inspired workflow :P)

UdjinM6 · 2019-03-15T13:13:13Z

This basically updates release notes (#2689, #2749, #2769) and chainparams (#2750) while ignoring client version bumps (#2686, #2749) and temporary litemode fix (#2694). Everything else is backports from develop to master which are merged back automagically with no changes.

Reproducible via git checkout develop && git checkout -b somebranch && git merge --no-ff master and resolving conflict the way it's described above.

…y#2627)

…ashpay#2649) * Adjust help text of `register*` rpc commands Copy/paste help for various fields of `register`/`register_prepare` instead of referring to `register_fund` Adjust description of provided functionality and expected results * Adjust whitespaces to match in different protx commands * Add missing results descriptions * Introduce new helper function GetHelpString to concentrate most of param descriptions in rpcevo in one place * [MOVEONLY] Move GetHelpString out of #ifdef ENABLE_WALLET/#endif * static const

…cific way (dashpay#2652) Benchmark Dash part while at it

…#2673) Otherwise duplicate-keys checks for deterministic masternodes triggers for duplicate/identical transactions.

[0.13.x] Backport multiple PRs from develop

* Add getspecialtxes rpc Returns an array of special transactions found in the specified block * small help text tweak * add comments

Otherwise we might end up passing and invalid proTx into it, causing assertions to fail and thus crash the process.

…stsProviderTxConflict` (dashpay#2691) * Invalid ProTxes should never reach addUnchecked * Invalid ProTxes should not cause existsProviderTxConflict to crash

[0.13.x] Backport multiple PRs from develop

* Release notes v0.13.1.0 * Add a note about no proto bump * update * Add a note about downgrading to 0.13.0.0 * 0.13.0.0->0.13.1.0 Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

…tInfoString (dashpay#2687) 8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake) Pull request description: As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`: <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png"> This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e: <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png"> Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea

…on (dashpay#2698) * Do not process blocks in CDeterministicMNManager before dip3 activation This should save us some cpu/disk on initial sync/reindex * Write initial snapshot on dip3 activation

…otx diff" (dashpay#2699) * Fix incorrect usage of begin() when genesis block is requested in "protx diff" .begin() on mapBlockIndex does NOT return the genesis block, but just the block with lowest hash. The fix is to use chainActive[0] to get the genesis block. * Update src/evo/simplifiedmns.cpp Co-Authored-By: codablock <ablock84@gmail.com>

It was reported on iOS that CMerkleBlock sometimes included the dummy quorum commitments introduced with v13, which led to banning of nodes as these were not supported/expected there. We should in general only include TXs here that are of interest for SPV nodes, so we should maintain the list of allowed TX types.

…2740)

…ashes (dashpay#2744) * Let Commit() return void The boolean return value will loose its meaning in the next commit * Implement 2-stage commits for CDBTransaction and CScopedDBTransaction CDBTransaction is changed to allow CDBBatch, CDBWrapper and other CDBTransactions as parent instead of just CDBWrapper. This in turn allows to implement multi-staged commits in CEvoDB. We now have the "current transaction" which is started and ended (commit or rollback) for each call to Connect-/DisconnectBlock. When the current transaction is committed, it moves its contents into the "root transaction" instead of directly writing to CDBWrapper. CommitRootTransaction() then handles the final commitment to CDBWrapper. It is called at the same time when the chainstate is flushed to disk, which guarantees consistency between chainstate and CEvoDB. * Allow to efficiently move values into parent transactions to avoid copies When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid copying values from this transaction to the parent transaction and instead pass values by rvalue and let the contents be moved. * Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)" This reverts commit 6dfceab.

…ay#2745)

[0.13.x] Backport multiple PRs from develop

* Bump version to 0.13.2 * Add release notes for 0.13.2.0 * Update credits * Add dashpay#2750 to changelog * Update doc/release-notes.md Co-Authored-By: codablock <ablock84@gmail.com>

Also move "Bump version to 0.13.2" to other

Resolved conflicts: configure.ac doc/Doxyfile doc/guide-startmany.md src/clientversion.h src/evo/deterministicmns.cpp src/evo/providertx.cpp src/qt/masternodelist.cpp src/qt/masternodelist.h src/rpc/masternode.cpp src/rpc/rpcevo.cpp src/validation.cpp

codablock

utACK (even though I'm still in favor of ditching this by git-flow inspired workflow :P)

UdjinM6and others added 30 commits February 5, 2019 07:35

Add checkbox to show only masternodes the wallet has keys for (dashpa…
332e036
…y#2627)

Wait for script checks to finish before messing with txes in Dash-spe…
070ad10
…cific way (dashpay#2652) Benchmark Dash part while at it

Bump block stats when adding commitment tx into block (dashpay#2654)
592210d

Invoke CheckSpecialTx after all normal TX checks have passed (dashpay…
0d8cc07
…#2673) Otherwise duplicate-keys checks for deterministic masternodes triggers for duplicate/identical transactions.

Add missing help text foroperatorPayoutAddress(dashpay#2679)
e189163

Stop checking MN protocol version before signalling DIP3 (dashpay#2684)
8961a6a

Fix bench log for payee and special txes (dashpay#2678)
023f8a0

Bump version to 0.13.1 (dashpay#2686)
bd0de48

Merge pull requestdashpay#2685from codablock/pr_v13_backports
34dee23
[0.13.x] Backport multiple PRs from develop

Add getspecialtxes rpc (dashpay#2668)
23eb70c
* Add getspecialtxes rpc Returns an array of special transactions found in the specified block * small help text tweak * add comments

Call existsProviderTxConflict after CheckSpecialTx (dashpay#2690)
6ada90c
Otherwise we might end up passing and invalid proTx into it, causing assertions to fail and thus crash the process.

Change the way invalid ProTxes are handled in addUnchecked and `exi…
da5a861
…stsProviderTxConflict` (dashpay#2691) * Invalid ProTxes should never reach addUnchecked * Invalid ProTxes should not cause existsProviderTxConflict to crash

Merge pull requestdashpay#2688from codablock/pr_v13_backports
68a2d8a
[0.13.x] Backport multiple PRs from develop

Release notes v0.13.1.0 (dashpay#2689)
bac6661
* Release notes v0.13.1.0 * Add a note about no proto bump * update * Add a note about downgrading to 0.13.0.0 * 0.13.0.0->0.13.1.0 Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>

Minimal fix for litemode vs bad-protx-key-not-same issue (dashpay#2694)
709ab6d

Fix some typos in doc/guide-startmany.md (dashpay#2711)
18f087b

Do not process blocks in CDeterministicMNManager before dip3 activati…
e75f971
…on (dashpay#2698) * Do not process blocks in CDeterministicMNManager before dip3 activation This should save us some cpu/disk on initial sync/reindex * Write initial snapshot on dip3 activation

Stop g_connman first before deleting it (dashpay#2734)
f868fbc

Add collateraladdress into masternode/protx list rpc output (dashpay#…
a11e2f9
…2740)

Make -masternodeblsprivkey mandatory when -masternode is given (dashp…
25222b3
…ay#2745)

Fix error message for invalid voting addresses (dashpay#2747)
6374dce

Merge pull requestdashpay#2746from codablock/pr_v13_backport
4d62f3c
[0.13.x] Backport multiple PRs from develop

Bump minChainWork and AssumeValid to block #1033120 (dashpay#2750)
9dd16cd

[0.13.x] Bump version to 0.13.2 and add release notes (dashpay#2749)
fbcb614
* Bump version to 0.13.2 * Add release notes for 0.13.2.0 * Update credits * Add dashpay#2750 to changelog * Update doc/release-notes.md Co-Authored-By: codablock <ablock84@gmail.com>

Move IS block filtering into ConnectBlock (dashpay#2766)
548a489

codablockand others added 2 commits March 13, 2019 16:01

Add missing entry to changelog (dashpay#2769)
4570079
Also move "Bump version to 0.13.2" to other

UdjinM6 added this to the 14.0 milestone Mar 15, 2019

codablock approved these changes Mar 18, 2019
View reviewed changes

UdjinM6 merged commit 2575e92 into dashpay:developMar 18, 2019

UdjinM6 deleted the mergemaster132develop branch November 26, 2020 11:38