Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/ttsao_refactor-beacon-core-types.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Ignored

- Refactored beacon core types to in beacon_core_types.proto
2,708 changes: 1,229 additions & 1,479 deletions proto/prysm/v1alpha1/beacon_block.pb.go

Large diffs are not rendered by default.

30 changes: 0 additions & 30 deletions proto/prysm/v1alpha1/beacon_block.proto
Original file line number Diff line number Diff line change
Expand Up @@ -319,18 +319,6 @@ message BeaconBlockBodyAltair {
SyncAggregate sync_aggregate = 9;
}

// The sync aggregate object for the beacon chain to track sync committee votes
// and to support light client infra.
message SyncAggregate {
// Sync committee bits as Bitvector to track votes.
bytes sync_committee_bits = 1 [
(ethereum.eth.ext.ssz_size) = "sync_committee_bytes.size",
(ethereum.eth.ext.cast_type) = "sync_committee_bits.type"
];

// BLS aggregated signature of the sync committee for the ones that voted.
bytes sync_committee_signature = 2 [ (ethereum.eth.ext.ssz_size) = "96" ];
}

// ----------------------------------------------------------------------------
// Bellatrix
Expand Down Expand Up @@ -1054,24 +1042,6 @@ message BlindedBeaconBlockBodyElectra {
ethereum.engine.v1.ExecutionRequests execution_requests = 13;
}

message AttesterSlashingElectra {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be going into core? if we go this way wouldn't it make more sense to have it in its own electra proto?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, since gloas.proto's beacon block will use AttesterSlashingElectra, it needs to live in a common place. From the slack discussion, there was some hesitation about moving existing objects already tied to the fork structure. The concern was that this would end up doing more than what’s required just to set up gloas.proto. For now, the goal is to keep the lift minimal rather than making the broader changes...

// First conflicting attestation.
IndexedAttestationElectra attestation_1 = 1;

// Second conflicting attestation.
IndexedAttestationElectra attestation_2 = 2;
}

message IndexedAttestationElectra {
repeated uint64 attesting_indices = 1
[ (ethereum.eth.ext.ssz_max) = "max_attesting_indices.size" ];

AttestationData data = 2;

// 96 bytes aggregate signature.
bytes signature = 3 [ (ethereum.eth.ext.ssz_size) = "96" ];
}

// ----------------------------------------------------------------------------
// Fulu
// ----------------------------------------------------------------------------
Expand Down
Loading
Loading