Skip to content

Commit 7312e89

Browse files
committed
Proto: Remove unused DataColumnIdentifier and add new StatusV2.
`DataColumnIdentifier` was removed in the spec here: ethereum/consensus-specs#4284. Eventually, we stopped using it in Prysm, but never removed the corresponding proto message. The new `StatusV2` is introduced in the spec here: ethereum/consensus-specs#4374
1 parent a2f73c8 commit 7312e89

File tree

7 files changed

+450
-315
lines changed

7 files changed

+450
-315
lines changed

changelog/manu-peerdas-variou.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
### Changed
2+
- In `TopicFromMessage`: Do not assume anymore that all Fulu specific topic are V3 only.
3+
4+
### Added
5+
- New `StatusV2` proto message.
6+
7+
### Removed
8+
- Unused `DataColumnIdentifier` proto message.

proto/prysm/v1alpha1/BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
# Common
33
##############################################################################
44

5-
load("@rules_proto//proto:defs.bzl", "proto_library")
6-
75
##############################################################################
86
# Go
97
##############################################################################
108
# gazelle:ignore
119
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
1210
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
11+
load("@rules_proto//proto:defs.bzl", "proto_library")
1312
load("//proto:ssz_proto_library.bzl", "ssz_proto_files")
1413
load("//tools:ssz.bzl", "SSZ_DEPS", "ssz_gen_marshal")
1514

@@ -189,6 +188,7 @@ ssz_fulu_objs = [
189188
"DataColumnIdentifier",
190189
"DataColumnsByRootIdentifier",
191190
"DataColumnSidecar",
191+
"StatusV2",
192192
"SignedBeaconBlockContentsFulu",
193193
"SignedBeaconBlockFulu",
194194
"SignedBlindedBeaconBlockFulu",
@@ -359,15 +359,17 @@ go_library(
359359
importpath = "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1",
360360
visibility = ["//visibility:public"],
361361
deps = SSZ_DEPS + [
362+
"//consensus-types/primitives:go_default_library",
362363
"//encoding/bytesutil:go_default_library",
363364
"//math:go_default_library",
364365
"//proto/engine/v1:go_default_library",
365366
"//proto/eth/ext:go_default_library",
366367
"//runtime/version:go_default_library",
367-
"//consensus-types/primitives:go_default_library",
368-
"@com_github_pkg_errors//:go_default_library",
369368
"@com_github_golang_protobuf//proto:go_default_library",
369+
"@com_github_pkg_errors//:go_default_library",
370370
"@com_github_prysmaticlabs_go_bitfield//:go_default_library", # keep
371+
"@com_github_sirupsen_logrus//:go_default_library",
372+
"@com_github_sirupsen_logrus//hooks/test:go_default_library",
371373
"@googleapis//google/api:annotations_go_proto",
372374
"@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
373375
"@io_bazel_rules_go//proto/wkt:empty_go_proto",
@@ -382,8 +384,6 @@ go_library(
382384
"@org_golang_google_protobuf//runtime/protoimpl:go_default_library",
383385
"@org_golang_google_protobuf//types/descriptorpb:go_default_library",
384386
"@org_golang_google_protobuf//types/known/emptypb:go_default_library",
385-
"@com_github_sirupsen_logrus//:go_default_library",
386-
"@com_github_sirupsen_logrus//hooks/test:go_default_library",
387387
],
388388
)
389389

proto/prysm/v1alpha1/data_columns.pb.go

Lines changed: 26 additions & 99 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/prysm/v1alpha1/data_columns.proto

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ message DataColumnSidecar {
4545
"kzg_commitments_inclusion_proof_depth.size,32" ];
4646
}
4747

48-
message DataColumnIdentifier {
49-
bytes block_root = 1 [ (ethereum.eth.ext.ssz_size) = "32" ];
50-
uint64 index = 2;
51-
}
52-
5348
message DataColumnsByRootIdentifier {
5449
bytes block_root = 1 [ (ethereum.eth.ext.ssz_size) = "32" ];
5550
repeated uint64 columns = 2 [ (ethereum.eth.ext.ssz_max) = "128" ];

0 commit comments

Comments
 (0)