eth2util: clone go-eth2-client data version #2462
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
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #2462 +/- ##
==========================================
- Coverage 53.70% 53.57% -0.13%
==========================================
Files 198 198
Lines 26506 26619 +113
==========================================
+ Hits 14234 14261 +27
- Misses 10510 10582 +72
- Partials 1762 1776 +14
☔ View full report in Codecov by Sentry. |
corverroos
commented
Jul 23, 2023
core/ssz.go
Outdated
| @@ -42,7 +43,7 @@ func (b VersionedSignedBeaconBlock) MarshalSSZ() ([]byte, error) { | |||
|
|
|||
| // MarshalSSZTo ssz marshals the VersionedSignedBeaconBlock object to a target array. | |||
| func (b VersionedSignedBeaconBlock) MarshalSSZTo(buf []byte) ([]byte, error) { | |||
| return marshalSSZVersionedTo(buf, b.Version, b.sszValFromVersion) | |||
| return marshalSSZVersionedTo(buf, eth2util.DataVersion(b.Version), b.sszValFromVersion) | |||
There was a problem hiding this comment.
note that casting isn't enough, we need to ensure the numbers we are working with are aligned with pre-v0.18.0
There was a problem hiding this comment.
this has been refactored to convert instead of cast.
corverroos
added
the
do not merge
xenowits
approved these changes
Jul 24, 2023
corverroos
removed
the
do not merge
dB2510
approved these changes
Jul 24, 2023
| return b, nil | ||
| } | ||
|
|
||
| // UnmarshalJSON unmarshals the DataVersion from strings or a number equaled to the go-eth2-client |
There was a problem hiding this comment.
Suggested change
| // UnmarshalJSON unmarshals the DataVersion from strings or a number equaled to the go-eth2-client | |
| // UnmarshalJSON unmarshals the DataVersion from string or a number equaled to the go-eth2-client |
| } | ||
|
|
||
| // ToETH2 returns a eth2spec.DataVersion equivalent to the DataVersion. | ||
| func (v DataVersion) ToETH2() eth2spec.DataVersion { |
There was a problem hiding this comment.
This method will return different values once we update go-eth2-client to v0.18, right?
corverroos
added
the
merge when ready
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.
Clones the go-eth2-client
github.com/attestantio/go-eth2-client/spec.DataVersiontype aligning with pre-v0.18 values.This is required since we serialise these version numbers over the wire so they MUST remain constant to ensure backwards compatibility between charon versions. go-eth2-client changed the
DataVersionnumbers in the recent v0.18.0 upgrade which we had to roll-back.This change allows the following:
The migration will look something like:
category: refactor
ticket: #2433