Add support for Electra #613

jtraglia · 2024-04-29T20:38:53Z

📝 Summary

This PR makes the necessary changes for Electra.

⛱ Motivation and Context

https://github.com/ethereum/consensus-specs/tree/dev/specs/electra

📚 References

Other Electra branches of dependencies:

✅ I have run these commands

make lint
make test-race
go mod tidy
I have seen and agree to CONTRIBUTING.md

avalonche · 2024-05-14T18:01:32Z

common/types.go

@@ -425,6 +453,8 @@ which is sufficient data to set the bid of the builder. The `Transactions`
 and `Withdrawals` fields are required to construct the full SignedBeaconBlock
 and are parsed asynchronously.

+TODO(JWT): Does this need to be updated? It hasn't been updated for Deneb.


can be separate upgrade added deneb support here #618

Yes, good idea. Thank you for making that PR. I will remove this comment.

jtraglia · 2024-05-15T18:53:58Z

I'm working on testing this with kurtosis this week. There are some minor issues. Most importantly, I forgot that we needed to add Electra support to flashbots/builder so simulation works. Will mark as a draft for now.

common/utils.go

avalonche · 2024-05-16T01:59:26Z

services/api/service_test.go

@@ -878,6 +879,9 @@ func TestCheckSubmissionPayloadAttrs(t *testing.T) {
 	for _, tc := range cases {
 		t.Run(tc.description, func(t *testing.T) {
 			_, _, backend := startTestBackend(t)
+			backend.relay.capellaEpoch = 1


maybe setting this should be part of startTestBackend

avalonche · 2024-05-16T02:03:01Z

services/api/service.go

-	// deneb specific logging
-	if payload.Deneb != nil {
+	if payload.Version >= spec.DataVersionDeneb {
+		blobs, err := payload.Blobs()


the purpose of the GetBlockSubmissionInfo struct is so we don't need to extract each field individually and handle the error once. you should be able to access these fields directly e.g. submission.Blobs

avalonche · 2024-05-16T02:05:38Z

services/api/utils.go

+			return ErrHeaderHTRMismatch
+		}
+
+		if len(bb.Electra.Message.Body.BlobKZGCommitments) != len(payload.Electra.BlobsBundle.Commitments) {


potential to extract to a separate function with BlobKZGCommitments as input

avalonche · 2024-05-16T02:26:30Z

services/api/service.go

+	withdrawalsRoot        phase0.Root
+	parentBeaconRoot       *phase0.Root
+	payloadAttributes      beaconclient.PayloadAttributes
+	depositReceiptsRoot    phase0.Root


has https://github.com/attestantio/go-eth2-client/blob/master/api/v1/payloadattributesevent.go been updated for latest payload attributes?
If so it can replace the types https://github.com/flashbots/mev-boost-relay/blob/main/beaconclient/prod_beacon_instance.go#L63-L83 which need updating to accept the new payload attributes. You'll also need to update processPayloadAttributes in service.go with the new payload attributes

avalonche · 2024-05-16T02:30:06Z

👍 feel free to fork the builder to build images for kurtosis. Let me know if you need me to rebase the builder from the latest geth electra branch

jtraglia · 2024-05-16T09:38:49Z

Let me know if you need me to rebase the builder from the latest geth electra branch

Yes please. That would be very useful! This is latest geth electra branch:

https://github.com/lightclient/go-ethereum/tree/prague-devnet-0

* fix(electra): send electra payload for flashbots_validateBuilderSubmissionV4 * Add electra case to VersionedSubmitBlockRequest.UnmarshalSSZ --------- Co-authored-by: Justin Traglia <[email protected]>

ryanschneider

overall lgtm, @avalonche are any of your comments blockers?

ryanschneider · 2025-02-06T19:56:20Z

common/types.go

+TODO(JWT): Does this need to be updated? It hasn't been updated for Deneb.
+


Suggested change

TODO(JWT): Does this need to be updated? It hasn't been updated for Deneb.

ryanschneider · 2025-02-06T20:18:29Z

@metachris please take a look. For context this version has been used successfully in both builder-playground and kurtosis alongside the latest rbuilder devnet-6 versions.

codecov-commenter · 2025-02-11T22:00:17Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 15.92179% with 301 lines in your changes missing coverage. Please review.

Project coverage is 32.64%. Comparing base (1d4b461) to head (a32d82a).
Report is 2 commits behind head on main.

Files with missing lines	Patch %	Lines
common/types_spec.go	3.10%	121 Missing and 4 partials ⚠️
services/api/service.go	20.28%	49 Missing and 6 partials ⚠️
common/types.go	0.00%	25 Missing ⚠️
common/utils.go	26.47%	19 Missing and 6 partials ⚠️
services/api/utils.go	0.00%	25 Missing ⚠️
datastore/redis.go	58.00%	21 Missing ⚠️
database/typesconv.go	5.00%	18 Missing and 1 partial ⚠️
services/api/blocksim_ratelimiter.go	0.00%	6 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #613      +/-   ##
==========================================
- Coverage   33.68%   32.64%   -1.05%     
==========================================
  Files          42       42              
  Lines        6682     6990     +308     
==========================================
+ Hits         2251     2282      +31     
- Misses       4156     4418     +262     
- Partials      275      290      +15

Flag	Coverage Δ
unittests	`32.64% <15.92%> (-1.05%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

This reverts commit a32d82a.

This reverts commit 54c9bf8.

This reverts commit 12fbbfc.

This reverts commit 8321f63.

This reverts commit 7fd62d4.

metachris · 2025-02-19T13:25:53Z

.github/workflows/checks.yml

@@ -47,10 +47,10 @@ jobs:
        uses: actions/checkout@v3

      - name: Install gofumpt
-        run: go install mvdan.cc/gofumpt@v0.4.0
+        run: go install mvdan.cc/gofumpt@latest


static pinning is better because otherwise at some point CI might just break.

This reverts commit 38711fd.

metachris

lgtm

jtraglia added 13 commits April 4, 2024 13:59

Begin to add Electra support

c9f2a02

Add electra fork versions & fix tests

9b69d61

Add ElectraUnblindSignedBlock

33b6f64

Use electra fork of go-boost-utils

8770896

Use electra fork of geth & add test

40aeed5

Add support for deposit receipts

5794db2

Run make fmt

096be7f

Update some redis things

573d448

Replace Exits with WithdrawRequests

770d711

Rename WithdrawRequest to WithdrawalRequest

8a5ed48

Merge remote-tracking branch 'origin/main' into electra

002f5e5

Use go-*-client@electra & lightclient's geth

ec5f753

Fix linter issues

a9caf4e

jtraglia marked this pull request as ready for review May 9, 2024 14:32

avalonche reviewed May 14, 2024

View reviewed changes

jtraglia marked this pull request as draft May 15, 2024 18:54

avalonche reviewed May 16, 2024

View reviewed changes

common/utils.go Outdated Show resolved Hide resolved

avalonche reviewed May 16, 2024

View reviewed changes

jtraglia and others added 6 commits May 17, 2024 11:08

Fix issues & temporarily skip block simulation

b0e3d4d

Use new go-eth2-client

e63a669

Use jtraglia's geth block-validation branch

3577f76

update deps

fba3991

Merge remote-tracking branch 'origin/main' into electra

7fb201f

Update for v1.5.0-alpha.6

40fe836

jtraglia and others added 8 commits January 13, 2025 08:47

Update go-eth2-client to latest electra commit

0557d53

Update golang version in Dockerfile

46c6c69

Add Electra case to VersionedSubmitBlockRequest

a6d2ce5

Fix call to flashbots_validateBuilderSubmissionV4 (#671)

e5d991e

* fix(electra): send electra payload for flashbots_validateBuilderSubmissionV4 * Add electra case to VersionedSubmitBlockRequest.UnmarshalSSZ --------- Co-authored-by: Justin Traglia <[email protected]>

Update go-builder-client & remove replacement

0743dc4

Merge branch 'main' into electra

8a6ed9f

fixup: re-run go mod tidy after resolving conflicts

fb6973b

fixup: use geth 1.14.13

fd61c64

ryanschneider reviewed Feb 6, 2025

View reviewed changes

fixup: geth math removed MaxUint64

fced1f3

ryanschneider marked this pull request as ready for review February 6, 2025 20:16

ryanschneider requested a review from metachris February 6, 2025 20:16

jtraglia added 4 commits February 10, 2025 06:59

Add temporary ffIgnoreAllValidationErrors flag

8321f63

Add some debug messages

12fbbfc

Add more debug prints

54c9bf8

Add another debug print

a32d82a

jtraglia added 5 commits February 12, 2025 16:28

Revert "Add another debug print"

7b592ea

This reverts commit a32d82a.

Revert "Add more debug prints"

65453e5

This reverts commit 54c9bf8.

Revert "Add some debug messages"

32e2449

This reverts commit 12fbbfc.

Revert "Add temporary ffIgnoreAllValidationErrors flag"

7fd62d4

This reverts commit 8321f63.

Reapply "Add temporary ffIgnoreAllValidationErrors flag"

38711fd

This reverts commit 7fd62d4.

metachris reviewed Feb 19, 2025

View reviewed changes

jtraglia added 2 commits February 19, 2025 07:27

Revert "Reapply "Add temporary ffIgnoreAllValidationErrors flag""

e6606f1

This reverts commit 38711fd.

Pin linter versions

0ba3dd0

metachris approved these changes Feb 19, 2025

View reviewed changes

jtraglia merged commit 13160be into main Feb 19, 2025
3 of 4 checks passed

jtraglia deleted the electra branch February 19, 2025 13:37

jtraglia mentioned this pull request Feb 19, 2025

Upgrade to go 1.24 and fix lint errors #681

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Electra #613

Add support for Electra #613

jtraglia commented Apr 29, 2024 •

edited

Loading

avalonche May 14, 2024

jtraglia May 15, 2024

jtraglia commented May 15, 2024

avalonche May 16, 2024

avalonche May 16, 2024 •

edited

Loading

avalonche May 16, 2024

avalonche May 16, 2024

avalonche commented May 16, 2024

jtraglia commented May 16, 2024

ryanschneider left a comment

ryanschneider Feb 6, 2025

ryanschneider commented Feb 6, 2025

codecov-commenter commented Feb 11, 2025

metachris Feb 19, 2025

metachris left a comment

		TODO(JWT): Does this need to be updated? It hasn't been updated for Deneb.

Add support for Electra #613

Add support for Electra #613

Conversation

jtraglia commented Apr 29, 2024 • edited Loading

📝 Summary

⛱ Motivation and Context

📚 References

✅ I have run these commands

avalonche May 14, 2024

Choose a reason for hiding this comment

jtraglia May 15, 2024

Choose a reason for hiding this comment

jtraglia commented May 15, 2024

avalonche May 16, 2024

Choose a reason for hiding this comment

avalonche May 16, 2024 • edited Loading

Choose a reason for hiding this comment

avalonche May 16, 2024

Choose a reason for hiding this comment

avalonche May 16, 2024

Choose a reason for hiding this comment

avalonche commented May 16, 2024

jtraglia commented May 16, 2024

ryanschneider left a comment

Choose a reason for hiding this comment

ryanschneider Feb 6, 2025

Choose a reason for hiding this comment

ryanschneider commented Feb 6, 2025

codecov-commenter commented Feb 11, 2025

Codecov Report

metachris Feb 19, 2025

Choose a reason for hiding this comment

metachris left a comment

Choose a reason for hiding this comment

jtraglia commented Apr 29, 2024 •

edited

Loading

avalonche May 16, 2024 •

edited

Loading