Merge stable to unstable no conflicts#5216
Merged
Conversation
* Cache and retransmit bls changes if submitted early * regossip when synced on/post capella * fix tests * modify publish vs cache condition * add logging * add error logging * batchify the processing * fix some of the cases * fix log issues * also delete included keys * fix lint * simplify gossip loop * fix build * refac to a versioned bls change store * update * logging improvements * improve logging and finish behavior * cleanup
…5027) * Add execution payload header to light client header capella onwards * add more forks * add allfork types * make other types multifork * make events multifork compatible * make lightclient routes multifork * update light-client transport * upgrade the blocktype on lightclient server import block * fixes * fix test * fix event serialization/deserilization type * update proof constants * fix payload index * update the light client update generation to multi fork * fix types * add spec override to pass specs * make event types allforks * make req/resp multifork * make types multifork throughout * fix the update serialize/deserialize * fix error log * better fork determination for update * fix the fork of finalized * fix tests * fix header upgradation
* Fix gossiping blsChange on submit if post capella * comment improvement
twoeths
previously approved these changes
Feb 28, 2023
Contributor
twoeths
left a comment
twoeths
left a comment
There was a problem hiding this comment.
imo this is best practice to follow, should consider it for Release.md @philknows
dapplion
force-pushed
the
unstable-conflict
branch
from
5692b32 to
761132c
Compare
dapplion
force-pushed
the
unstable-conflict
branch
from
761132c to
3b9ecba
Compare
Contributor
Performance Report✔️ no performance regression detected Full benchmark results
|
twoeths
approved these changes
Feb 28, 2023
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Motivation
There are conflicts merging stable to unstable that must be resolved manually.
Description
Merge stable to unstable no conflicts
Strategy I followed
Fix conflicts manually, the use local git visualizer to check that no changes are included or dropped unintended