*: fix compatibility with latest go-eth2-client #2650

xenowits · 2023-10-19T07:57:16Z

Fix charon's compatibility with latest release of go-eth2-client which contains breaking changes, notably the ETH2 client interface methods. This PR also enables easy integration of deneb fork as the data structures for deneb are included in the new release. An example of the API change is as follows:

Earlier

validatorsProvider.Validators(ctx, "head", nil)

Now

validatorsProvider.Validators(ctx, &api.ValidatorsOpts{
  State: "head",
})

Also fix corresponding tests.

category: feature
ticket: #2646

codecov · 2023-10-19T10:56:29Z

Codecov Report

Attention: 622 lines in your changes are missing coverage. Please review.

Comparison is base (1e87eb9) 53.27% compared to head (47169ff) 53.16%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2650      +/-   ##
==========================================
- Coverage   53.27%   53.16%   -0.12%     
==========================================
  Files         202      202              
  Lines       27517    27980     +463     
==========================================
+ Hits        14661    14875     +214     
- Misses      11005    11244     +239     
- Partials     1851     1861      +10

Files	Coverage Δ
app/eth2wrap/valcache.go	`74.57% <100.00%> (+2.87%)`	⬆️
core/scheduler/scheduler.go	`76.96% <100.00%> (+1.00%)`	⬆️
core/tracker/tracker.go	`79.51% <100.00%> (ø)`
core/validatorapi/eth2types.go	`50.00% <ø> (ø)`
eth2util/eth2exp/attagg_old.go	`52.94% <100.00%> (+4.00%)`	⬆️
eth2util/signing/signing.go	`39.21% <100.00%> (+2.48%)`	⬆️
core/tracker/inclusion.go	`41.06% <75.00%> (ø)`
app/eth2wrap/success.go	`50.00% <50.00%> (ø)`
app/monitoringapi.go	`50.00% <50.00%> (-0.58%)`	⬇️
core/bcast/bcast.go	`66.17% <66.66%> (ø)`
... and 20 more

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

core/validatorapi/validatorapi.go

 	defer span.End()

-	return c.awaitAttFunc(ctx, int64(slot), int64(committeeIndex))
+	att, err := c.awaitAttFunc(ctx, int64(opts.Slot), int64(opts.CommitteeIndex))


core/validatorapi/validatorapi.go

 	defer span.End()

-	return c.awaitAttFunc(ctx, int64(slot), int64(committeeIndex))
+	att, err := c.awaitAttFunc(ctx, int64(opts.Slot), int64(opts.CommitteeIndex))


core/validatorapi/validatorapi.go

 	awaitSyncContributionFunc func(ctx context.Context, slot, subcommIdx int64, beaconBlockRoot eth2p0.Root) (*altair.SyncCommitteeContribution, error)
 	awaitAggAttFunc           func(ctx context.Context, slot int64, attestationRoot eth2p0.Root) (*eth2p0.Attestation, error)
 	awaitAggSigDBFunc         func(context.Context, core.Duty, core.PubKey) (core.SignedData, error)
 	dutyDefFunc               func(ctx context.Context, duty core.Duty) (core.DutyDefinitionSet, error)
 	subs                      []func(context.Context, core.Duty, core.ParSignedDataSet) error
 }

+func (c *Component) Proposal(ctx context.Context, opts *eth2api.ProposalOpts) (*eth2api.Response[*eth2api.VersionedProposal], error) {
+	// Get proposer pubkey (this is a blocking query).
+	pubkey, err := c.getProposerPubkey(ctx, core.NewProposerDuty(int64(opts.Slot)))


core/validatorapi/validatorapi.go

+		Signature: opts.RandaoReveal,
+	}
+
+	duty := core.NewRandaoDuty(int64(opts.Slot))


core/validatorapi/validatorapi.go

+
+func (c *Component) BlindedProposal(ctx context.Context, opts *eth2api.BlindedProposalOpts) (*eth2api.Response[*eth2api.VersionedBlindedProposal], error) {
+	// Get proposer pubkey (this is a blocking query).
+	pubkey, err := c.getProposerPubkey(ctx, core.NewBuilderProposerDuty(int64(opts.Slot)))


core/validatorapi/validatorapi.go

+		Signature: opts.RandaoReveal,
+	}
+
+	duty := core.NewRandaoDuty(int64(opts.Slot))


xenowits · 2023-10-26T13:51:04Z

FYI: This PR also solves #2477

app/eth2wrap/synthproposer.go

core/dutydb/memory.go

core/eth2signeddata.go

core/fetcher/fetcher.go

testutil/validatormock/propose.go

core/validatorapi/validatorapi.go

app/eth2wrap/synthproposer_test.go

core/unsigneddata.go

testutil/fuzz.go

core/validatorapi/router.go

core/validatorapi/validatorapi.go

-	// Query unsigned block (this is blocking).
-	block, err := c.awaitBlockFunc(ctx, int64(slot))
+	// Query unsigned proposal (this is blocking).
+	proposal, err := c.awaitProposalFunc(ctx, int64(opts.Slot))


core/validatorapi/validatorapi.go

@@ -446,17 +407,56 @@
 	//  - Once inserted, the query below will return.

 	// Query unsigned block (this is blocking).
-	block, err := c.awaitBlindedBlockFunc(ctx, int64(slot))
+	proposal, err := c.awaitBlindedProposalFunc(ctx, int64(opts.Slot))


sonarcloud · 2023-10-30T08:37:23Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
18 Code Smells

No Coverage information
3.2% Duplication

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

xenowits self-assigned this Oct 19, 2023

xenowits force-pushed the xenowits/fix-eth2-client branch 3 times, most recently from 77fc3df to 81aaaba Compare October 19, 2023 10:54

github-advanced-security bot found potential problems Oct 21, 2023

View reviewed changes

xenowits force-pushed the xenowits/fix-eth2-client branch from 60465c3 to 92a7df9 Compare October 24, 2023 03:39

xenowits mentioned this pull request Oct 26, 2023

update to new deneb changes #2659

Closed

3 tasks

dB2510 reviewed Oct 27, 2023

View reviewed changes

xenowits added 15 commits October 27, 2023 13:56

refactor according to latest go-eth2-client changes

143ffb0

fix bug

4effcaf

fix golangci-lint

84fc12d

add workaround for validator state fuzz test failures

d10b443

fix failing tests due to upstream changes

b0ba99d

fix so many things

688fc19

fix validator api test

6f2c421

fix validator api test

0c01564

fix fetcher test

18aced1

fix more tests

bb043a3

fix sigagg tests

474f317

remove validator status check

1d47492

fix unsigned tests

5064f8d

fix linter and some tests

ae71836

fix issues from first self review

96dd01c

gsora reviewed Oct 27, 2023

View reviewed changes

app/eth2wrap/synthproposer_test.go Show resolved Hide resolved

core/unsigneddata.go Show resolved Hide resolved

testutil/fuzz.go Outdated Show resolved Hide resolved

testutil/fuzz.go Show resolved Hide resolved

core/validatorapi/router.go Show resolved Hide resolved

xenowits added 2 commits October 27, 2023 15:10

review comments 1

2107bfc

only use slot for querying proposals

0d1921d

xenowits force-pushed the xenowits/fix-eth2-client branch from 421242e to 0d1921d Compare October 27, 2023 09:51

github-advanced-security bot found potential problems Oct 27, 2023

View reviewed changes

dB2510 approved these changes Oct 30, 2023

View reviewed changes

bump go-eth2-client to v0.19.4

47169ff

gsora approved these changes Oct 30, 2023

View reviewed changes

xenowits added the merge when ready Indicates bulldozer bot may merge when all checks pass label Oct 30, 2023

obol-bulldozer bot merged commit 4632e21 into main Oct 30, 2023
13 of 15 checks passed

obol-bulldozer bot deleted the xenowits/fix-eth2-client branch October 30, 2023 10:20

dB2510 mentioned this pull request Oct 31, 2023

add /eth/v2/beacon/blinded_blocks to validatorapi #2477

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: fix compatibility with latest go-eth2-client #2650

*: fix compatibility with latest go-eth2-client #2650

xenowits commented Oct 19, 2023

codecov bot commented Oct 19, 2023 •

edited

xenowits commented Oct 26, 2023

sonarcloud bot commented Oct 30, 2023

*: fix compatibility with latest go-eth2-client #2650

*: fix compatibility with latest go-eth2-client #2650

Conversation

xenowits commented Oct 19, 2023

codecov bot commented Oct 19, 2023 • edited

Codecov Report

xenowits commented Oct 26, 2023

sonarcloud bot commented Oct 30, 2023

codecov bot commented Oct 19, 2023 •

edited