Skip to content

Conversation

Fuzzbawls
Copy link
Collaborator

@Fuzzbawls Fuzzbawls commented Dec 27, 2020

further backports for the 5.0 branch:

#2094
#2093
#2095
#2096
#2098
#2104
#2102
#2097
#2103
#2101
#2108
#2109

furszy and others added 20 commits December 26, 2020 22:01
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
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
-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
@Fuzzbawls Fuzzbawls added this to the 5.0.0 milestone Dec 27, 2020
@Fuzzbawls Fuzzbawls self-assigned this Dec 27, 2020
random-zebra and others added 2 commits December 27, 2020 19:45
Thus reduce default min fee for shielded txes by 10x

Github-Pull: PIVX-Project#2108
Rebased-From: 6a33d4f
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 41abf5a

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 41abf5a and merging...

@random-zebra random-zebra merged commit 41c3b6f into PIVX-Project:5.0 Dec 28, 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.

4 participants