[Bug] wrong reserveKey when committing budget/proposal collaterals #1855
Conversation
This file contains 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
furszy
approved these changes
Sep 16, 2020
Fuzzbawls
approved these changes
Sep 17, 2020
|
merging... |
furszy
added a commit
that referenced
this pull request
Sep 24, 2020
2d10e2e [Trivial][UI] Fix init messages (random-zebra) 3e8ccf0 missing mnping category added to logcategories (furszy) f182bc8 [Cleanup] emplace CRecipient + remove extra hashing of budget objects (random-zebra) 6204902 [Refactor] Unify GetBudgetSystemCollTX and GetBudgetFinalizationCollTX (random-zebra) 8398b2e [BUG] Duplicated ReserveKey in CBudgetManager::SubmitFinalBudget() (random-zebra) 9c0d4b1 Remove unused mapRequest tracking. (furszy) a7b3b4f miner: removing a not needed block requests tracking. (furszy) 921fc4b GUI: removing unused TransactionDesc file (static toHTML function is not being called anymore). (furszy) d956349 GUI: transactionTablemodel, remove unused LongDescriptionRole. (furszy) Pull request description: Simple back porting PR to 4.3 branch, including: #1853 #1855 #1860 #1863 ACKs for top commit: random-zebra: utACK 2d10e2e Fuzzbawls: utACK 2d10e2e Tree-SHA512: b23eabfc1ba1c2896782fe77b25d8edad2e0ec6dc0f3a9e78add257e4cf801605bf0f1943690bc04f70587b6d9a8d179770dd312eec40bbfa605bb3caf20cc05
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.
The
CReserveKeypassed toGetBudgetFinalizationCollateralTX/GetBudgetSystemCollateralTX(for the change address) is not the same that is later passed toCommitTransaction.So, if commit fails, for whatever reason, the original key is not returned to the keypool.
Also, the implementations of
GetBudgetFinalizationCollateralTXandGetBudgetSystemCollateralTXare absolutely identical. The only difference is a single constant variable (the fee amount used).Unify them in
CreateBudgetFeeTX(passing a boolfFinalizationto select the correct proposal/finalized-budget fee amount).