Overhaul blinded types into multi-fork #4565
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
g11tech
force-pushed
the
g11tech/blinded-forks
branch
from
21ed66c
to
a7f7775
Compare
Performance Report✔️ no performance regression detected Full benchmark results
|
dapplion
suggested changes
Sep 19, 2022
| @@ -443,7 +443,12 @@ export function getReturnTypes(): ReturnTypes<Api> { | |||
| getSyncCommitteeDuties: ContainerDataExecutionOptimistic(ArrayOf(SyncDuty)), | |||
| produceBlock: ContainerData(ssz.phase0.BeaconBlock), | |||
| produceBlockV2: WithVersion((fork: ForkName) => ssz[fork].BeaconBlock), | |||
| produceBlindedBlock: WithVersion((_fork: ForkName) => ssz.bellatrix.BlindedBeaconBlock), | |||
| produceBlindedBlock: WithVersion((fork: ForkName) => { | |||
| if (fork === ForkName.phase0 || fork === ForkName.altair) { | |||
There was a problem hiding this comment.
Use ForkSeq and < ForkSeq.bellatrix comparator
There was a problem hiding this comment.
Same for packages/config/src/forkConfig/index.ts
There was a problem hiding this comment.
in packages/config/src/forkConfig/index.ts typescript can't infer with seq comparision that fork is not pre bellatrix causing type issues for accessing ssz.allForksBlinded[forkName]
There was a problem hiding this comment.
also same here as well
There was a problem hiding this comment.
duplicated the bellatrix blinded types for phase0 and altair for type consistency, the check here is no more required, while the check in packages/config/src/forkConfig/index.ts is now using seq comparision. let me know if this approach is good
There was a problem hiding this comment.
Oh right, yeah then it's okay typesafety always wins
dapplion
reviewed
Sep 20, 2022
| altair: { | ||
| BeaconBlockBody: bellatrix.BlindedBeaconBlockBody, | ||
| BeaconBlock: bellatrix.BlindedBeaconBlock, | ||
| SignedBeaconBlock: bellatrix.SignedBlindedBeaconBlock, |
There was a problem hiding this comment.
I actually prefer your original approach of using multiple ForkName comparisions and only defining the types for forks with blinded blocks. Sorry for the back and forth!
g11tech
force-pushed
the
g11tech/blinded-forks
branch
from
efa304a
to
ac307a2
Compare
dapplion
approved these changes
Sep 20, 2022
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 blinded types currently used (for dev simplicity) are only of
bellatrixThis PR overhauls blinded types into multi-fork in preparation for the
capellahardfork