Merge pull request #352 from attestantio/fulu

Add Fulu support

Author: Bez625

go.mod

@@ -5,9 +5,9 @@ go 1.23.0
 toolchain go1.23.2
 
 require (
-	github.com/attestantio/go-block-relay v0.4.4
-	github.com/attestantio/go-builder-client v0.6.4
-	github.com/attestantio/go-eth2-client v0.26.0
+	github.com/attestantio/go-block-relay v0.5.0
+	github.com/attestantio/go-builder-client v0.7.1
+	github.com/attestantio/go-eth2-client v0.27.0
 	github.com/aws/aws-sdk-go v1.55.6
 	github.com/holiman/uint256 v1.3.2
 	github.com/mitchellh/go-homedir v1.1.0
@@ -100,6 +100,7 @@ require (
 	github.com/prometheus/common v0.63.0 // indirect
 	github.com/prometheus/procfs v0.16.0 // indirect
 	github.com/r3labs/sse/v2 v2.10.0 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 // indirect

go.sum

@@ -74,12 +74,14 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/attestantio/go-block-relay v0.4.4 h1:GhU8KdwOGA3squVCzFQ5H9G+63/ggmWuKS5M8hTME58=
-github.com/attestantio/go-block-relay v0.4.4/go.mod h1:S6OLyaLiLnxI8VRwJLJnDkTn2VdBZ/fSbePBjEfQlFM=
-github.com/attestantio/go-builder-client v0.6.4 h1:D0gBdQO4vJLhoFLxdR2TbGdfsWBQZ5YDZBNdU2Ap3uk=
-github.com/attestantio/go-builder-client v0.6.4/go.mod h1:f8wi3HzuPxfJoi2PirpJK3yZhte4SavDgKJbRrKoB1Q=
-github.com/attestantio/go-eth2-client v0.26.0 h1:oDWKvIUJfvr1EBi/w9L6mawYZHOCymjHkml7fZplT20=
-github.com/attestantio/go-eth2-client v0.26.0/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY=
+github.com/attestantio/go-block-relay v0.5.0 h1:AOyc6oL5XnShLOTHwLHEpOQ8/Zo0MIfgTs9QwNIMP1w=
+github.com/attestantio/go-block-relay v0.5.0/go.mod h1:rVB4n9b0b/k2QN/Mj6DXjlIuUxqVzd4FHgD0Vzq7WDg=
+github.com/attestantio/go-builder-client v0.7.0 h1:Kxf5eTKQlU4syv3Uzt8v3vKKm7im1W4CjRAZiPYoqTQ=
+github.com/attestantio/go-builder-client v0.7.0/go.mod h1:wGZ0U3QX8/F4lWwieJpqCPgXIl8gbfBxm8iViznrTFQ=
+github.com/attestantio/go-builder-client v0.7.1 h1:wKzmfuizxBE6q00Gguk71fHkcudwOcxn/W4uvll36Fo=
+github.com/attestantio/go-builder-client v0.7.1/go.mod h1:wGZ0U3QX8/F4lWwieJpqCPgXIl8gbfBxm8iViznrTFQ=
+github.com/attestantio/go-eth2-client v0.27.0 h1:zOXtDVnMNRwX6GjpJYgXUNsXckEx76pGRDi76i7xhSI=
+github.com/attestantio/go-eth2-client v0.27.0/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY=
 github.com/aws/aws-sdk-go v1.44.81/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk=
 github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
@@ -362,8 +364,8 @@ github.com/r3labs/sse/v2 v2.10.0 h1:hFEkLLFY4LDifoHdiCN/LlGBAdVJYsANaLqNYa1l/v0=
 github.com/r3labs/sse/v2 v2.10.0/go.mod h1:Igau6Whc+F17QUgML1fYe1VPZzTV6EMCnYktEmkNJ7I=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U=

main.go

@@ -115,7 +115,7 @@ import (
 )
 
 // ReleaseVersion is the release version for the code.
-var ReleaseVersion = "1.11.1"
+var ReleaseVersion = "1.12.0-beta.1"
 
 func main() {
 	exitCode := main2()

services/attestationaggregator/standard/service.go

@@ -294,6 +294,20 @@ func createVersionedAggregateAndProof(duty *attestationaggregator.Duty, aggregat
 			Electra: aggregateAndProof,
 		}
 		return versionedAggregateAndProof, nil
+	case spec.DataVersionFulu:
+		if aggregateAttestation.Fulu == nil {
+			return nil, errors.New("no fulu attestation")
+		}
+		aggregateAndProof := &electra.AggregateAndProof{
+			AggregatorIndex: duty.ValidatorIndex,
+			Aggregate:       aggregateAttestation.Fulu,
+			SelectionProof:  duty.SlotSignature,
+		}
+		versionedAggregateAndProof := &spec.VersionedAggregateAndProof{
+			Version: aggregateAttestation.Version,
+			Fulu:    aggregateAndProof,
+		}
+		return versionedAggregateAndProof, nil
 	default:
 		return &spec.VersionedAggregateAndProof{}, errors.New("unknown version")
 	}
@@ -379,6 +393,19 @@ func createVersionedSignedAggregateAndProof(aggregateAndProof *spec.VersionedAgg
 			Electra: signedAggregateAndProof,
 		}
 		return signedVersionedAggregateAndProof, nil
+	case spec.DataVersionFulu:
+		if aggregateAndProof.Fulu == nil {
+			return nil, errors.New("no fulu aggregate and proof")
+		}
+		signedAggregateAndProof := &electra.SignedAggregateAndProof{
+			Message:   aggregateAndProof.Fulu,
+			Signature: sig,
+		}
+		signedVersionedAggregateAndProof := &spec.VersionedSignedAggregateAndProof{
+			Version: aggregateAndProof.Version,
+			Fulu:    signedAggregateAndProof,
+		}
+		return signedVersionedAggregateAndProof, nil
 	default:
 		return &spec.VersionedSignedAggregateAndProof{}, errors.New("unknown version")
 	}

services/beaconblockproposer/standard/propose.go

@@ -30,6 +30,7 @@ import (
 	apiv1capella "github.com/attestantio/go-eth2-client/api/v1/capella"
 	apiv1deneb "github.com/attestantio/go-eth2-client/api/v1/deneb"
 	apiv1electra "github.com/attestantio/go-eth2-client/api/v1/electra"
+	apiv1fulu "github.com/attestantio/go-eth2-client/api/v1/fulu"
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/altair"
 	"github.com/attestantio/go-eth2-client/spec/bellatrix"
@@ -229,6 +230,9 @@ func (*Service) confirmProposalData(_ context.Context,
 	return nil
 }
 
+// skipcq: GO-R1005
+// Complexity is due to handling all Ethereum protocol versions.
+// Each version requires specific signing logic for blinded/unblinded proposals.
 func (s *Service) signProposalData(ctx context.Context,
 	proposal *api.VersionedProposal,
 	duty *beaconblockproposer.Duty,
@@ -336,6 +340,22 @@ func (s *Service) signProposalData(ctx context.Context,
 				Blobs:     proposal.Electra.Blobs,
 			}
 		}
+	case spec.DataVersionFulu:
+		if proposal.Blinded {
+			signedProposal.FuluBlinded = &apiv1electra.SignedBlindedBeaconBlock{
+				Message:   proposal.FuluBlinded,
+				Signature: sig,
+			}
+		} else {
+			signedProposal.Fulu = &apiv1fulu.SignedBlockContents{
+				SignedBlock: &electra.SignedBeaconBlock{
+					Message:   proposal.Fulu.Block,
+					Signature: sig,
+				},
+				KZGProofs: proposal.Fulu.KZGProofs,
+				Blobs:     proposal.Fulu.Blobs,
+			}
+		}
 	default:
 		return nil, errors.New("unhandled proposal version")
 	}
@@ -369,6 +389,9 @@ func (s *Service) auctionBlock(ctx context.Context,
 	return auctionResults, nil
 }
 
+// skipcq: GO-R1005
+// Complexity is due to handling all Ethereum protocol versions.
+// Each version requires specific logic to convert blinded to unblinded blocks.
 func (s *Service) unblindProposal(ctx context.Context,
 	proposal *api.VersionedSignedProposal,
 	providers []builderclient.UnblindedProposalProvider,
@@ -398,6 +421,7 @@ func (s *Service) unblindProposal(ctx context.Context,
 						Capella:   proposal.CapellaBlinded,
 						Deneb:     proposal.DenebBlinded,
 						Electra:   proposal.ElectraBlinded,
+						Fulu:      proposal.FuluBlinded,
 					},
 				})
 
@@ -457,6 +481,9 @@ func (s *Service) unblindProposal(ctx context.Context,
 		case spec.DataVersionElectra:
 			proposal.ElectraBlinded = nil
 			proposal.Electra = signedBlock.Electra
+		case spec.DataVersionFulu:
+			proposal.FuluBlinded = nil
+			proposal.Fulu = signedBlock.Fulu
 		default:
 			return fmt.Errorf("unsupported version %v", proposal.Version)
 		}

services/blockrelay/standard/unblindblock.go

@@ -54,6 +54,8 @@ func (s *Service) UnblindBlock(ctx context.Context,
 		proposal.DenebBlinded = block.Deneb
 	case spec.DataVersionElectra:
 		proposal.ElectraBlinded = block.Electra
+	case spec.DataVersionFulu:
+		proposal.FuluBlinded = block.Fulu
 	default:
 		return nil, fmt.Errorf("unsupported block version %v", block.Version)
 	}
@@ -158,6 +160,7 @@ func (s *Service) unblindProposal(ctx context.Context,
 						Capella:   proposal.CapellaBlinded,
 						Deneb:     proposal.DenebBlinded,
 						Electra:   proposal.ElectraBlinded,
+						Fulu:      proposal.FuluBlinded,
 					},
 				})
 
@@ -226,6 +229,9 @@ func assignSignedProposal(proposal *api.VersionedSignedProposal, signedProposal
 	case spec.DataVersionElectra:
 		proposal.ElectraBlinded = nil
 		proposal.Electra = signedProposal.Electra
+	case spec.DataVersionFulu:
+		proposal.FuluBlinded = nil
+		proposal.Fulu = signedProposal.Fulu
 	default:
 		return fmt.Errorf("unsupported version %v", proposal.Version)
 	}

services/cache/standard/events.go

@@ -89,6 +89,14 @@ func (s *Service) updateFromBlock(block *spec.VersionedSignedBeaconBlock) {
 			s.log.Trace().Uint64("height", executionPayload.BlockNumber).Stringer("hash", executionPayload.BlockHash).Msg("Updating execution chain head")
 			s.setExecutionChainHead(executionPayload.BlockHash, executionPayload.BlockNumber)
 		}
+	case spec.DataVersionFulu:
+		// Execution information available.
+		executionPayload := block.Fulu.Message.Body.ExecutionPayload
+		if executionPayload != nil && !executionPayload.StateRoot.IsZero() {
+			s.setBlockGasLimit(executionPayload.BlockNumber, executionPayload.GasLimit)
+			s.log.Trace().Uint64("height", executionPayload.BlockNumber).Stringer("hash", executionPayload.BlockHash).Msg("Updating execution chain head")
+			s.setExecutionChainHead(executionPayload.BlockHash, executionPayload.BlockNumber)
+		}
 	default:
 		s.log.Error().Msg("Unhandled block version")
 	}