[v0.16.x] Backport more PRs to 0.16#3693
Merged
UdjinM6 merged 12 commits intoSep 12, 2020
Merged
Conversation
…trol (dashpay#3625) Prior to this commit there are (imo) flaws in the behaviour of the PrivateSend tab. - If you enter an address, label, add a recipient, do whatever in the normal Send tab its also reflected in the PrivateSend tab - If you select fully mixed coins in the Send tab's CoinControl they are also selected in the PrivateSend tab if you switch over. - If you select non-fully mixed coins in the Send tab's CoinControl you get a warning when switching over to PrivateSend tab due to non-fully mixed coins selected in CoinControl. With giving the private send tab separate instances of `SendCoinsDialog` and `CCoinControl` they are independent from each other which just makes more sense imo and by doing this the points above are solved. I would say this just better reflects the actual behaviour of a tab.
* Avoid translating "PrivateSend" * Make some strings translatable
* Harden Spork6 Spork6 was previously activated on testnet, but we then developed an alternative fix for the issue and never activated spork6 on mainnet. At this point, Spork6 will not be activated on mainnet. As such, it makes sense to harden Spork6 and ensure that spork6 will never be activated on mainnet. So, we just change from checking Spork6 to checking if we are on testnet. If we are on testnet, use spork6 logic, else don't. Signed-off-by: pasta <pasta@dashboost.org> * remove now unused SPORK_6_NEW_SIGS Signed-off-by: pasta <pasta@dashboost.org> * force fSporkSixActive to be correct, otherwise return Signed-off-by: pasta <pasta@dashboost.org> * Harden spork6 even more * Add TODO in chainparams as a reminder to drop all spork6 related code on next testnet reset Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
…ashpay#3666) * test: Fix importwallet_rescan test The wallet should be removed after the dumpwallet() call otherwise it may lead to unepexted behaviour in other wallet tests since the wallet stays in vpwallets then. * tests: Change where RemoveWallet call is to be more in line with upstream Signed-off-by: pasta <pasta@dashboost.org> Co-authored-by: pasta <pasta@dashboost.org>
Signed-off-by: pasta <pasta@dashboost.org>
* [QT] Add last block hash to debug ui Trivial addition to display last block hash next to last block time * [QT] Make last block hash selectable ... and linter happy Switch QMetaObject to get last hash from pIndex instead of clientmodel * [Trivial] Fix trailing whitespaces
UdjinM6
reviewed
Sep 10, 2020
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
Might be a good idea to backport some other related fixes, see below. Looks good otherwise.
Signed-off-by: Pasta <pasta@dashboost.org>
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
Member
Author
|
Tag removed from all backported PRs |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This backports:
#3625
#3629
#3656
#3662
#3666
#3669
#3672
#3685
#3687
as well as a partial backport of #3636