forked from dashpay/dash
-
Notifications
You must be signed in to change notification settings - Fork 723
[Backport] 5.0 backports Part 2 #2107
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
Merged
Merged
Conversation
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
Github-Pull: PIVX-Project#2094 Rebased-From: 575349b
Github-Pull: PIVX-Project#2093 Rebased-From: 8fd6af0
…badge. Github-Pull: PIVX-Project#2095 Rebased-From: 8972187
Github-Pull: PIVX-Project#2095 Rebased-From: aafbd8e
Github-Pull: PIVX-Project#2095 Rebased-From: d54fab5
Github-Pull: PIVX-Project#2096 Rebased-From: f54c206
Github-Pull: PIVX-Project#2098 Rebased-From: 373dd28
Github-Pull: PIVX-Project#2104 Rebased-From: f79a00d
shield balance is already cached in unconfirmed_shielded_balance, which is then added to unconfirmed_balance to get the total. Github-Pull: PIVX-Project#2102 Rebased-From: 149524f
Instead of returning the full TX JSON object, just return the hex string for use in functional tests and in real-world use for `sendrawtransaction` Github-Pull: PIVX-Project#2097 Rebased-From: 681a16b
- Make sure we're indicating when a command requires the wallet to be unlocked. - Add whitespace lines to improve readability between description, arguments, results, and examples - Remove duplicate/errant Result lines in `getsaplingnotescount` Github-Pull: PIVX-Project#2097 Rebased-From: 58e64b1
Github-Pull: PIVX-Project#2097 Rebased-From: dab4677
Do not return an error if a different peer port is used for tor addresses. The peer is behind a hidden service which has the port fixed to the default port. Github-Pull: PIVX-Project#2103 Rebased-From: 2cd0670
Github-Pull: PIVX-Project#2103 Rebased-From: b878bff
Github-Pull: PIVX-Project#2101 Rebased-From: f5f8bd9
Github-Pull: PIVX-Project#2101 Rebased-From: 2b53142
Github-Pull: PIVX-Project#2101 Rebased-From: 3aaa510
Github-Pull: PIVX-Project#2101 Rebased-From: a005fa7
-BEGIN VERIFY SCRIPT- sed -i 's/alloted/allotted/g' src/*/*.h src/*/*.cpp test/functional/*.py ; sed -i 's/Alloted/Allotted/g' src/*/*.h src/*/*.cpp test/functional/*.py ; -END VERIFY SCRIPT- Github-Pull: PIVX-Project#2101 Rebased-From: 72abccf
the cycle is 144 blocks, not 146. Use the available GetBlockValue/nBudgetCycleBlocks, instead of hardcoding the constants. Note: GetTotalBudget should consider the possibility of changes to the block value, between consecutive superblocks. Since the chain already passed the last reduction, and the block value is fixed at 5, we can leave this as is for now. Github-Pull: PIVX-Project#2101 Rebased-From: bdfaaed
Thus reduce default min fee for shielded txes by 10x Github-Pull: PIVX-Project#2108 Rebased-From: 6a33d4f
Github-Pull: PIVX-Project#2109 Rebased-From: f12af33
furszy
approved these changes
Dec 28, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 41abf5a
random-zebra
approved these changes
Dec 28, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK 41abf5a and merging...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
further backports for the 5.0 branch:
#2094
#2093
#2095
#2096
#2098
#2104
#2102
#2097
#2103
#2101
#2108
#2109