diff --git a/consensus-types/blocks/factory.go b/consensus-types/blocks/factory.go
index 68b4c6c2cc5f..5a3f347a08bc 100644
--- a/consensus-types/blocks/factory.go
+++ b/consensus-types/blocks/factory.go
@@ -272,6 +272,7 @@ func BuildSignedBeaconBlockFromExecutionPayload(
 	var fullBlock interface{}
 	switch p := payload.(type) {
 	case *enginev1.ExecutionPayload:
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.Body().Attestations()))
 		for i, att := range b.Body().Attestations() {
 			a, ok := att.(*eth.Attestation)
@@ -305,6 +306,7 @@ func BuildSignedBeaconBlockFromExecutionPayload(
 		if err != nil {
 			return nil, err
 		}
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.Body().Attestations()))
 		for i, att := range b.Body().Attestations() {
 			a, ok := att.(*eth.Attestation)
@@ -343,6 +345,7 @@ func BuildSignedBeaconBlockFromExecutionPayload(
 		if err != nil {
 			return nil, err
 		}
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.Body().Attestations()))
 		for i, att := range b.Body().Attestations() {
 			a, ok := att.(*eth.Attestation)
diff --git a/consensus-types/blocks/getters.go b/consensus-types/blocks/getters.go
index 0a75d697a336..b2e0de229c78 100644
--- a/consensus-types/blocks/getters.go
+++ b/consensus-types/blocks/getters.go
@@ -251,6 +251,7 @@ func (b *SignedBeaconBlock) ToBlinded() (interfaces.ReadOnlySignedBeaconBlock, e
 		if err != nil {
 			return nil, err
 		}
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.block.body.attestations))
 		for i, att := range b.block.body.attestations {
 			a, ok := att.(*eth.Attestation)
@@ -285,6 +286,7 @@ func (b *SignedBeaconBlock) ToBlinded() (interfaces.ReadOnlySignedBeaconBlock, e
 		if err != nil {
 			return nil, err
 		}
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.block.body.attestations))
 		for i, att := range b.block.body.attestations {
 			a, ok := att.(*eth.Attestation)
@@ -320,6 +322,7 @@ func (b *SignedBeaconBlock) ToBlinded() (interfaces.ReadOnlySignedBeaconBlock, e
 		if err != nil {
 			return nil, err
 		}
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.block.body.attestations))
 		for i, att := range b.block.body.attestations {
 			a, ok := att.(*eth.Attestation)
diff --git a/consensus-types/blocks/proto.go b/consensus-types/blocks/proto.go
index b9d98cfc1de5..87db50a328b6 100644
--- a/consensus-types/blocks/proto.go
+++ b/consensus-types/blocks/proto.go
@@ -293,6 +293,7 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
 
 	switch b.version {
 	case version.Phase0:
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.attestations))
 		for i, att := range b.attestations {
 			a, ok := att.(*eth.Attestation)
@@ -311,6 +312,7 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
 			VoluntaryExits:    b.voluntaryExits,
 		}, nil
 	case version.Altair:
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.attestations))
 		for i, att := range b.attestations {
 			a, ok := att.(*eth.Attestation)
@@ -339,6 +341,7 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
 					return nil, errPayloadHeaderWrongType
 				}
 			}
+			// TODO: extend to Electra
 			atts := make([]*eth.Attestation, len(b.attestations))
 			for i, att := range b.attestations {
 				a, ok := att.(*eth.Attestation)
@@ -367,6 +370,7 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
 				return nil, errPayloadWrongType
 			}
 		}
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.attestations))
 		for i, att := range b.attestations {
 			a, ok := att.(*eth.Attestation)
@@ -396,6 +400,7 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
 					return nil, errPayloadHeaderWrongType
 				}
 			}
+			// TODO: extend to Electra
 			atts := make([]*eth.Attestation, len(b.attestations))
 			for i, att := range b.attestations {
 				a, ok := att.(*eth.Attestation)
@@ -425,6 +430,7 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
 				return nil, errPayloadWrongType
 			}
 		}
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.attestations))
 		for i, att := range b.attestations {
 			a, ok := att.(*eth.Attestation)
@@ -455,6 +461,7 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
 					return nil, errPayloadHeaderWrongType
 				}
 			}
+			// TODO: extend to Electra
 			atts := make([]*eth.Attestation, len(b.attestations))
 			for i, att := range b.attestations {
 				a, ok := att.(*eth.Attestation)
@@ -485,6 +492,7 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
 				return nil, errPayloadWrongType
 			}
 		}
+		// TODO: extend to Electra
 		atts := make([]*eth.Attestation, len(b.attestations))
 		for i, att := range b.attestations {
 			a, ok := att.(*eth.Attestation)