Skip to content

Commit 215fbcb

Browse files
authored
Remove Fulu block and state. (#14905)
* Remove Fulu block and state. * Add missing tests. * Alias `ProtobufBeaconStateFulu` to `ProtobufBeaconStateElectra`
1 parent e39f44b commit 215fbcb

38 files changed

+1600
-5878
lines changed

api/server/structs/block.go

+10-50
Original file line numberDiff line numberDiff line change
@@ -579,14 +579,14 @@ type SignedBeaconBlockContentsFulu struct {
579579
}
580580

581581
type BeaconBlockContentsFulu struct {
582-
Block *BeaconBlockFulu `json:"block"`
583-
KzgProofs []string `json:"kzg_proofs"`
584-
Blobs []string `json:"blobs"`
582+
Block *BeaconBlockElectra `json:"block"`
583+
KzgProofs []string `json:"kzg_proofs"`
584+
Blobs []string `json:"blobs"`
585585
}
586586

587587
type SignedBeaconBlockFulu struct {
588-
Message *BeaconBlockFulu `json:"message"`
589-
Signature string `json:"signature"`
588+
Message *BeaconBlockElectra `json:"message"`
589+
Signature string `json:"signature"`
590590
}
591591

592592
var _ SignedMessageJsoner = &SignedBeaconBlockFulu{}
@@ -599,36 +599,12 @@ func (s *SignedBeaconBlockFulu) SigString() string {
599599
return s.Signature
600600
}
601601

602-
type BeaconBlockFulu struct {
603-
Slot string `json:"slot"`
604-
ProposerIndex string `json:"proposer_index"`
605-
ParentRoot string `json:"parent_root"`
606-
StateRoot string `json:"state_root"`
607-
Body *BeaconBlockBodyFulu `json:"body"`
608-
}
609-
610-
type BeaconBlockBodyFulu struct {
611-
RandaoReveal string `json:"randao_reveal"`
612-
Eth1Data *Eth1Data `json:"eth1_data"`
613-
Graffiti string `json:"graffiti"`
614-
ProposerSlashings []*ProposerSlashing `json:"proposer_slashings"`
615-
AttesterSlashings []*AttesterSlashingElectra `json:"attester_slashings"`
616-
Attestations []*AttestationElectra `json:"attestations"`
617-
Deposits []*Deposit `json:"deposits"`
618-
VoluntaryExits []*SignedVoluntaryExit `json:"voluntary_exits"`
619-
SyncAggregate *SyncAggregate `json:"sync_aggregate"`
620-
ExecutionPayload *ExecutionPayloadDeneb `json:"execution_payload"`
621-
BLSToExecutionChanges []*SignedBLSToExecutionChange `json:"bls_to_execution_changes"`
622-
BlobKzgCommitments []string `json:"blob_kzg_commitments"`
623-
ExecutionRequests *ExecutionRequests `json:"execution_requests"`
624-
}
625-
626602
type BlindedBeaconBlockFulu struct {
627-
Slot string `json:"slot"`
628-
ProposerIndex string `json:"proposer_index"`
629-
ParentRoot string `json:"parent_root"`
630-
StateRoot string `json:"state_root"`
631-
Body *BlindedBeaconBlockBodyFulu `json:"body"`
603+
Slot string `json:"slot"`
604+
ProposerIndex string `json:"proposer_index"`
605+
ParentRoot string `json:"parent_root"`
606+
StateRoot string `json:"state_root"`
607+
Body *BlindedBeaconBlockBodyElectra `json:"body"`
632608
}
633609

634610
type SignedBlindedBeaconBlockFulu struct {
@@ -645,19 +621,3 @@ func (s *SignedBlindedBeaconBlockFulu) MessageRawJson() ([]byte, error) {
645621
func (s *SignedBlindedBeaconBlockFulu) SigString() string {
646622
return s.Signature
647623
}
648-
649-
type BlindedBeaconBlockBodyFulu struct {
650-
RandaoReveal string `json:"randao_reveal"`
651-
Eth1Data *Eth1Data `json:"eth1_data"`
652-
Graffiti string `json:"graffiti"`
653-
ProposerSlashings []*ProposerSlashing `json:"proposer_slashings"`
654-
AttesterSlashings []*AttesterSlashingElectra `json:"attester_slashings"`
655-
Attestations []*AttestationElectra `json:"attestations"`
656-
Deposits []*Deposit `json:"deposits"`
657-
VoluntaryExits []*SignedVoluntaryExit `json:"voluntary_exits"`
658-
SyncAggregate *SyncAggregate `json:"sync_aggregate"`
659-
ExecutionPayloadHeader *ExecutionPayloadHeaderDeneb `json:"execution_payload_header"`
660-
BLSToExecutionChanges []*SignedBLSToExecutionChange `json:"bls_to_execution_changes"`
661-
BlobKzgCommitments []string `json:"blob_kzg_commitments"`
662-
ExecutionRequests *ExecutionRequests `json:"execution_requests"`
663-
}

0 commit comments

Comments
 (0)