Feature: Dynamic Protocol State #5336
Merged
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
…part-1_-_suggestions1
…hub.com/onflow/flow-go into yurii/4649-prev-epoch-refactoring-attempt
• revised goDoc of protocol state implementation • changed `ProtocolStateEntry.PreviousEpoch` to pointer (consistent with `ProtocolStateEntry.NextEpoch`) • There should be no significant algorithmic changes. Though, I have switched the order of the if and else branches when processing an Epoch Setup event. For me, this is much more in line with the intuitive order of documentation. state/protocol/protocol_state/updater.go: • notable updates and revisions of goDoc • tried to address concerns around inconsistent handling of invariances • updated code to work with `ProtocolStateEntry.PreviousEpoch` being potentially a nil pointer storage/badger/protocol_state_test.go: • detailed goDoc revisions for test `assertRichProtocolStateValidity`
…-attempt_-_suggestions
…och-refactoring-attempt
Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>
…mit. Updated tests, error handling, docs
…ithub.com/onflow/flow-go into yurii/4649-prev-epoch-refactoring-attempt
…nflow/flow-go into yurii/5517-extend-payload
… ordering assumptions in the system smart contracts vs the core protocol layer.
…`Updater.ProcessEpochSetup()` such that the documentation and implementation are in the same order
…nflow/flow-go into yurii/5517-extend-payload
…nd, moved it to rootblock cmd
…. Updated finalize command to correctly read prepared data.
It is commented out on HEAD, uncommented on master. Causes following error when uncommented here: ``` CGO_CFLAGS="" mockgen -destination=storage/mocks/storage.go -package=mocks github.com/onflow/flow-go/storage Blocks,Headers,Payloads,Collections,Commits,Events,ServiceEvents,TransactionResults # MERGE: Line below commented out on HEAD CGO_CFLAGS="" mockgen -destination=module/mocks/network.go -package=mocks github.com/onflow/flow-go/module Local,Requester 2024/01/30 10:30:40 Failed to format generated source code: module/mocks/network.go:67:65: missing ',' in type argument list (and 3 more errors) ```
This version includes ProtocolStateID and all changes to date on master
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #5336 +/- ##
==========================================
- Coverage 56.79% 55.93% -0.87%
==========================================
Files 757 1017 +260
Lines 75303 97998 +22695
==========================================
+ Hits 42767 54812 +12045
- Misses 29196 39082 +9886
- Partials 3340 4104 +764
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
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.
This PR includes all changes from the Dynamic Protocol State feature branch and conflict resolution from #5325.
Rather than merging
jordan/sync-dyn-proto-state--master->feature/dynamic-protocol-state, thenfeature/dynamic-protocol-state->master, this PR mergesjordan/sync-dyn-proto-state--master->masterdirectly. This is because conflicts resolved in the sync PR re-appeared in the feature branch PR; but since the feature branch is protected we can't resolve conflicts there directly (same problem as #5071).It replaces #5158.