Add Badger DataVersion

superblock-dev · Jan 15, 2025 · cf19378 · cf19378
1 parent 24c0995
commit cf19378
Show file tree

Hide file tree

Showing 24 changed files with 162 additions and 157 deletions.
diff --git a/api/v1/payloadattributesevent.go b/api/v1/payloadattributesevent.go
@@ -462,7 +462,7 @@ func (e *PayloadAttributesEvent) MarshalJSON() ([]byte, error) {
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to marshal payload attributes v3")
 		}
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if e.Data.V4 == nil {
 			return nil, errors.New("no payload attributes v4 data")
 		}
@@ -592,7 +592,7 @@ func (e *PayloadAttributesEvent) unpack(data *payloadAttributesEventJSON) error
 			return err
 		}
 		e.Data.V3 = &payloadAttributes
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		var payloadAttributes PayloadAttributesV4
 		err = json.Unmarshal(data.Data.PayloadAttributes, &payloadAttributes)
 		if err != nil {

diff --git a/api/versionedblindedbeaconblock.go b/api/versionedblindedbeaconblock.go
@@ -58,7 +58,7 @@ func (v *VersionedBlindedBeaconBlock) Slot() (phase0.Slot, error) {
 		}
 
 		return v.Deneb.Slot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return 0, ErrDataMissing
 		}
@@ -90,7 +90,7 @@ func (v *VersionedBlindedBeaconBlock) ProposerIndex() (phase0.ValidatorIndex, er
 		}
 
 		return v.Deneb.ProposerIndex, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return 0, ErrDataMissing
 		}
@@ -125,7 +125,7 @@ func (v *VersionedBlindedBeaconBlock) RandaoReveal() (phase0.BLSSignature, error
 		}
 
 		return v.Deneb.Body.RANDAOReveal, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil {
 			return phase0.BLSSignature{}, ErrDataMissing
@@ -161,7 +161,7 @@ func (v *VersionedBlindedBeaconBlock) Graffiti() ([32]byte, error) {
 		}
 
 		return v.Deneb.Body.Graffiti, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil {
 			return [32]byte{}, ErrDataMissing
@@ -218,7 +218,7 @@ func (v *VersionedBlindedBeaconBlock) Attestations() ([]spec.VersionedAttestatio
 		}
 
 		return versionedAttestations, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil || v.Electra.Body == nil {
 			return nil, ErrDataMissing
 		}
@@ -258,7 +258,7 @@ func (v *VersionedBlindedBeaconBlock) Root() (phase0.Root, error) {
 		}
 
 		return v.Deneb.HashTreeRoot()
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return phase0.Root{}, ErrDataMissing
 		}
@@ -290,7 +290,7 @@ func (v *VersionedBlindedBeaconBlock) BodyRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.Body.HashTreeRoot()
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return phase0.Root{}, ErrDataMissing
 		}
@@ -322,7 +322,7 @@ func (v *VersionedBlindedBeaconBlock) ParentRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.ParentRoot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return phase0.Root{}, ErrDataMissing
 		}
@@ -354,7 +354,7 @@ func (v *VersionedBlindedBeaconBlock) StateRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.StateRoot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return phase0.Root{}, ErrDataMissing
 		}
@@ -392,7 +392,7 @@ func (v *VersionedBlindedBeaconBlock) TransactionsRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.Body.ExecutionPayloadHeader.TransactionsRoot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil ||
 			v.Electra.Body.ExecutionPayloadHeader == nil {
@@ -432,7 +432,7 @@ func (v *VersionedBlindedBeaconBlock) FeeRecipient() (bellatrix.ExecutionAddress
 		}
 
 		return v.Deneb.Body.ExecutionPayloadHeader.FeeRecipient, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil ||
 			v.Electra.Body.ExecutionPayloadHeader == nil {
@@ -472,7 +472,7 @@ func (v *VersionedBlindedBeaconBlock) Timestamp() (uint64, error) {
 		}
 
 		return v.Deneb.Body.ExecutionPayloadHeader.Timestamp, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil ||
 			v.Electra.Body.ExecutionPayloadHeader == nil {
@@ -506,7 +506,7 @@ func (v *VersionedBlindedBeaconBlock) String() string {
 		}
 
 		return v.Deneb.String()
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return ""
 		}

diff --git a/api/versionedblindedproposal.go b/api/versionedblindedproposal.go
@@ -58,7 +58,7 @@ func (v *VersionedBlindedProposal) Slot() (phase0.Slot, error) {
 		}
 
 		return v.Deneb.Slot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return 0, ErrDataMissing
 		}
@@ -90,7 +90,7 @@ func (v *VersionedBlindedProposal) ProposerIndex() (phase0.ValidatorIndex, error
 		}
 
 		return v.Deneb.ProposerIndex, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return 0, ErrDataMissing
 		}
@@ -125,7 +125,7 @@ func (v *VersionedBlindedProposal) RandaoReveal() (phase0.BLSSignature, error) {
 		}
 
 		return v.Deneb.Body.RANDAOReveal, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil {
 			return phase0.BLSSignature{}, ErrDataMissing
@@ -161,7 +161,7 @@ func (v *VersionedBlindedProposal) Graffiti() ([32]byte, error) {
 		}
 
 		return v.Deneb.Body.Graffiti, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil {
 			return [32]byte{}, ErrDataMissing
@@ -218,7 +218,7 @@ func (v *VersionedBlindedProposal) Attestations() ([]spec.VersionedAttestation,
 		}
 
 		return versionedAttestations, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil || v.Electra.Body == nil {
 			return nil, ErrDataMissing
 		}
@@ -258,7 +258,7 @@ func (v *VersionedBlindedProposal) Root() (phase0.Root, error) {
 		}
 
 		return v.Deneb.HashTreeRoot()
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return phase0.Root{}, ErrDataMissing
 		}
@@ -293,7 +293,7 @@ func (v *VersionedBlindedProposal) BodyRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.Body.HashTreeRoot()
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil {
 			return phase0.Root{}, ErrDataMissing
@@ -326,7 +326,7 @@ func (v *VersionedBlindedProposal) ParentRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.ParentRoot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return phase0.Root{}, ErrDataMissing
 		}
@@ -358,7 +358,7 @@ func (v *VersionedBlindedProposal) StateRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.StateRoot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return phase0.Root{}, ErrDataMissing
 		}
@@ -396,7 +396,7 @@ func (v *VersionedBlindedProposal) TransactionsRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.Body.ExecutionPayloadHeader.TransactionsRoot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil ||
 			v.Electra.Body.ExecutionPayloadHeader == nil {
@@ -436,7 +436,7 @@ func (v *VersionedBlindedProposal) FeeRecipient() (bellatrix.ExecutionAddress, e
 		}
 
 		return v.Deneb.Body.ExecutionPayloadHeader.FeeRecipient, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil ||
 			v.Electra.Body.ExecutionPayloadHeader == nil {
@@ -476,7 +476,7 @@ func (v *VersionedBlindedProposal) Timestamp() (uint64, error) {
 		}
 
 		return v.Deneb.Body.ExecutionPayloadHeader.Timestamp, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Body == nil ||
 			v.Electra.Body.ExecutionPayloadHeader == nil {
@@ -510,7 +510,7 @@ func (v *VersionedBlindedProposal) String() string {
 		}
 
 		return v.Deneb.String()
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return ""
 		}

diff --git a/api/versionedblockrequest.go b/api/versionedblockrequest.go
@@ -55,7 +55,7 @@ func (v *VersionedBlockRequest) Slot() (phase0.Slot, error) {
 		}
 
 		return v.Deneb.Message.Slot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Message == nil {
 			return 0, ErrDataMissing
@@ -97,7 +97,7 @@ func (v *VersionedBlockRequest) ExecutionBlockHash() (phase0.Hash32, error) {
 		}
 
 		return v.Deneb.Message.Body.ExecutionPayload.BlockHash, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Message == nil ||
 			v.Electra.Message.Body == nil ||
@@ -162,7 +162,7 @@ func (v *VersionedBlockRequest) Attestations() ([]spec.VersionedAttestation, err
 		}
 
 		return versionedAttestations, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Message == nil ||
 			v.Electra.Message.Body == nil {
@@ -207,7 +207,7 @@ func (v *VersionedBlockRequest) Root() (phase0.Root, error) {
 		}
 
 		return v.Deneb.Message.HashTreeRoot()
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Message == nil {
 			return phase0.Root{}, ErrDataMissing
@@ -246,7 +246,7 @@ func (v *VersionedBlockRequest) BodyRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.Message.Body.HashTreeRoot()
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Message == nil ||
 			v.Electra.Message.Body == nil {
@@ -283,7 +283,7 @@ func (v *VersionedBlockRequest) ParentRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.Message.ParentRoot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Message == nil {
 			return phase0.Root{}, ErrDataMissing
@@ -319,7 +319,7 @@ func (v *VersionedBlockRequest) StateRoot() (phase0.Root, error) {
 		}
 
 		return v.Deneb.Message.StateRoot, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Message == nil {
 			return phase0.Root{}, ErrDataMissing
@@ -382,7 +382,7 @@ func (v *VersionedBlockRequest) AttesterSlashings() ([]spec.VersionedAttesterSla
 		}
 
 		return versionedAttesterSlashings, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Message == nil ||
 			v.Electra.Message.Body == nil {
@@ -430,7 +430,7 @@ func (v *VersionedBlockRequest) ProposerSlashings() ([]*phase0.ProposerSlashing,
 		}
 
 		return v.Deneb.Message.Body.ProposerSlashings, nil
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil ||
 			v.Electra.Message == nil ||
 			v.Electra.Message.Body == nil {
@@ -464,7 +464,7 @@ func (v *VersionedBlockRequest) String() string {
 		}
 
 		return v.Deneb.String()
-	case spec.DataVersionAlpaca:
+	case spec.DataVersionAlpaca, spec.DataVersionBadger:
 		if v.Electra == nil {
 			return ""
 		}