Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport] 4.2.0 backports #1758

Merged
merged 21 commits into from
Jul 24, 2020
Merged

[Backport] 4.2.0 backports #1758

merged 21 commits into from
Jul 24, 2020

Conversation

Fuzzbawls
Copy link
Collaborator

@Fuzzbawls Fuzzbawls commented Jul 22, 2020

backports the following PRs that have been merged since the 4.2 branch-off:

#1717
#1733
#1736
#1742
#1741
#1744
#1287
#1751
#1747
#1749
#1763

furszy and others added 20 commits July 22, 2020 13:57
Coming from btc@0fd599767d2dabf25ac8c3543cb586cfc4b9d816

Github-Pull: PIVX-Project#1717
Rebased-From: 266b1a0
Coming from btc@bb16c8894becfba8764b13d448ba6e7e7f1608c2

Github-Pull: PIVX-Project#1717
Rebased-From: 49f4124
This removes the fFromLoadWallet flag in AddToWallet.  These were already
effectively two methods.

Coming from btc@00f09c920c2e8906d2260251be6d1d2fa1bbb29d

Github-Pull: PIVX-Project#1717
Rebased-From: c3779c5
Adjust the settingsconsolewidget event filter to explicitely recognize
the key combo for clearing the console.

Github-Pull: PIVX-Project#1744
Rebased-From: ff9e3d8
-nuparams startup arg added.

help message for nuparams startup arg

Github-Pull: PIVX-Project#1747
Rebased-From: 2db8a11
UPGRADE_TESTDUMMY needs to be always at the end to be inlined with the networkUpgrades vector position.

Github-Pull: PIVX-Project#1747
Rebased-From: 924a27d
Problem: we are still signaling updates from really old transactions from the backend and, at the same time, the GUI is not loading more than 20k transactions into the transactionTableModel.

So, old transactions that are not being shown in the GUI deliberately are re appearing due the signaling update process.

This commits solves it, not showing transactions that appeared before the first tx time loaded into the model.
Ofc this is only applied if the wallet is exceeding the maximum loaded transactions limit in the GUI (20,000 transactions)

Github-Pull: PIVX-Project#1749
Rebased-From: b711a7a
@Fuzzbawls Fuzzbawls added this to the 4.2.0 milestone Jul 22, 2020
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 919e060

@Fuzzbawls Fuzzbawls changed the title 4.2.0 backports [WIP] 4.2.0 backports Jul 22, 2020
@Fuzzbawls
Copy link
Collaborator Author

Marked as [WIP] as will need to do a final translation PR and add it here

furszy added a commit that referenced this pull request Jul 24, 2020
22ba678 [GUI] Update translations from transifex (Fuzzbawls)

Pull request description:

  For inclusion in 4.2.0

  #1758 will be updated once this is merged

ACKs for top commit:
  furszy:
    utACK 22ba678
  random-zebra:
    utACK 22ba678

Tree-SHA512: cf3051e8b40aa53ccc1c73a13574658ca1650cbb7e535bbadf9a13eb708e76e9ccd318df0b6e34e1dac304c52bfc1f5db8fe6a48ecfdba763b341edb6c16e7b0
For inclusion in 4.2.0

Github-Pull: PIVX-Project#1763
Rebased-From: 22ba678
@Fuzzbawls Fuzzbawls changed the title [WIP] 4.2.0 backports [Backport] 4.2.0 backports Jul 24, 2020
@Fuzzbawls
Copy link
Collaborator Author

Added #1763, ready for review

@Fuzzbawls Fuzzbawls requested a review from furszy July 24, 2020 20:10
@Fuzzbawls Fuzzbawls self-assigned this Jul 24, 2020
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK dd22385 , ready for 4.2 :) .

@furszy furszy merged commit 034518f into PIVX-Project:4.2 Jul 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants