[Refactoring] Budget, round 4: remove Broadcast classes #1851
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
random-zebra
force-pushed
the
202009_budget_nuke-broadcasts
branch
2 times, most recently
from
5f44329 to
5045657
Compare
random-zebra
force-pushed
the
202009_budget_nuke-broadcasts
branch
4 times, most recently
from
8de3a0c to
6034c6f
Compare
1 task
random-zebra
force-pushed
the
202009_budget_nuke-broadcasts
branch
2 times, most recently
from
b8be313 to
5da20e0
Compare
random-zebra
force-pushed
the
202009_budget_nuke-broadcasts
branch
2 times, most recently
from
26169a6 to
fcff0c0
Compare
Author
|
Rebased on master. Ready for review. |
Returning the serialized object for the network message. Also, introduce class constructors from CDataStream.
Just use mapProposals and mapFinalizedBudgets to check for existence
random-zebra
force-pushed
the
202009_budget_nuke-broadcasts
branch
from
fcff0c0 to
5004e1f
Compare
Author
|
Rebased and renamed |
furszy
approved these changes
Oct 23, 2020
Fuzzbawls
approved these changes
Oct 26, 2020
random-zebra
added a commit
that referenced
this pull request
Nov 2, 2020
…ndexes d7a1c99 [Cleanup] Extra call to CBudgetMan::SetBestHeight in reconsiderblock (random-zebra) 5d0731e [Cleanup] Remove redundant Clear in CBudgetManager constructor (random-zebra) 48b723e [Budget] Remove proposal/budgets if FeeTx block is disconnected (random-zebra) 9c6173c [Budget] Introduce mapFeeTxToProposal and mapFeeTxToBudget (random-zebra) Pull request description: Based on top of: - [x] #1851 Starting with `[Budget] Introduce mapFeeTxToProposal and mapFeeTxToBudget` (0eb9e45) Since #1845 we no longer check repeatedly the active chain, when updating a budget object, we just save the height of the block including the collateral tx (ref #1845), when we first add the proposal/budget to the map. Therefore we need to handle the case where said block is disconnected from the chain. In order to do so efficiently, this PR adds two indexes (`mapFeeTxToBudget`/`mapFeeTxToProposal`), mapping collateral txids to the relative budget objects (while such objects are stored in the map). A simple function `CBudgetManager::RemoveByFeeTxId()` can then be called from `DisconnectBlock` when undoing transactions, in order to remove the now-conflicted budget objects (without performing any expensive search). ACKs for top commit: furszy: nice, code review ACK d7a1c99. Fuzzbawls: ACK d7a1c99 Tree-SHA512: 9dd8a671032f79105219b7a0e3e0514b991ff92e55834f5adad4964fb9b5c1842bbb0c0995c9b504ca79c5c86115061f4a93e9b4560a63c2beaf66aa5915c2f5
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Continues the budget-refactoring thread.
Remove the following classes entirely
CBudgetProposalBroadcastCFinalizedBudgetBroadcastReplace them with a new dastream-based constructor and a
GetBroadcastfunction (returning the serialized stream) insideCBudgetProposal/CFinalizedBudgetclasses.This allows us to get rid also of
mapSeenProposalsandmapSeenFinalizedBudgetsand all the relative ugly code duplication (just rely onmapProposalsandmapFinalizedBudgetsto check for existence, and to get the broadcast messages to send).Based on top of
Starts with
[Refactoring] Introduce CFinalizedBudget/CBudgetProposal::GetBroadcast(37c629881372e492a65ea17a4b18ad02cd53ed58)