core/fetcher: add DutyProposer to fetcher #305
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
corverroos
approved these changes
Mar 29, 2022
| @@ -84,6 +89,10 @@ func (f *Fetcher) Fetch(ctx context.Context, duty core.Duty, argSet core.FetchAr | |||
| return nil | |||
| } | |||
|
|
|||
| func (f *Fetcher) RegisterAggSigDB(fn func(context.Context, core.Duty, core.PubKey) (core.AggSignedData, error)) { | |||
There was a problem hiding this comment.
add godoc, include is should be called before usage since not thread safe
corverroos
reviewed
Mar 29, 2022
core/fetcher/fetcher.go
Outdated
Comment on lines
156
to
157
| var graffiti [32]byte | ||
| _, _ = rand.Read(graffiti[:]) |
There was a problem hiding this comment.
I can't be unique, aggregation will fail I think. Just do empty graffiti for now.
corverroos
approved these changes
Mar 30, 2022
core/interfaces.go
Outdated
| @@ -139,6 +143,7 @@ func Wire( | |||
| ) { | |||
| sched.Subscribe(fetch.Fetch) | |||
| fetch.Subscribe(cons.Propose) | |||
|
|
|||
core/types.go
Outdated
| @@ -165,6 +165,13 @@ type AttestationData struct { | |||
| Duty eth2v1.AttesterDuty | |||
| } | |||
|
|
|||
| // ProposerData wraps the eth2 beacon block data and adds the original duty. | |||
| // The original duty allows mapping the partial signed response from the VC. | |||
| type ProposerData struct { | |||
There was a problem hiding this comment.
This type isn't required. It was required for attestation, but it isn't for block proposal. The VC queries unsigneddata by slot, which is included in block.
core/encode.go
Outdated
| @@ -161,3 +161,24 @@ func EncodeRandaoAggSignedData(randao eth2p0.BLSSignature) AggSignedData { | |||
| func DecodeRandaoAggSignedData(data AggSignedData) eth2p0.BLSSignature { | |||
| return data.Signature.ToETH2() | |||
| } | |||
|
|
|||
| // EncodeProposerUnsignedData returns the proposer data as an encoded UnsignedData. | |||
| func EncodeProposerUnsignedData(proData *ProposerData) (UnsignedData, error) { | |||
There was a problem hiding this comment.
As mentioned in comment below, remove ProposerData struct. Here you should de/encode eth2spec.VersionedBeaconBlock directly.
testutil/beaconmock/options.go
Outdated
| @@ -211,7 +213,7 @@ func WithSlotsPerEpoch(slotsPerEpoch int) Option { | |||
|
|
|||
| // WithDeterministicDuties configures the mock to provide deterministic duties based on provided arguments and config. | |||
| // Note it depends on ValidatorsFunc being populated, e.g. via WithValidatorSet. | |||
| //nolint:revive | |||
| //nolint:revive,dupl | |||
| func WithDeterministicDuties(factor int) Option { | |||
There was a problem hiding this comment.
remove this if not used anymore
There was a problem hiding this comment.
this is used in scheduler_test.go for dutyproposer and dutyattester both
corverroos
reviewed
Mar 30, 2022
core/fetcher/fetcher.go
Outdated
| // TODO(dhruv): what to do with graffiti? | ||
| // passing empty graffiti since it is not required in API | ||
| var graffiti [32]byte | ||
| proData, err := f.eth2Cl.BeaconBlockProposal(ctx, eth2p0.Slot(uint64(slot)), randaoEth2, graffiti[:]) |
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.
Adds DutyProposer in Fetcher
category: feature
ticket: #222