simplify

consensus-types/primitives/slot.go

@@ -7,6 +7,10 @@ import (
 	"github.com/prysmaticlabs/prysm/v4/math"
 )
 
+type Root [32]byte
+type Signature [96]byte
+type Bloom [256]byte
+
 var _ fssz.HashRoot = (Slot)(0)
 var _ fssz.Marshaler = (*Slot)(nil)
 var _ fssz.Unmarshaler = (*Slot)(nil)

proto/eth/ext/options.proto

@@ -29,4 +29,5 @@ extend google.protobuf.FieldOptions {
   string ssz_size = 50001;
   string ssz_max = 50002;
   string spec_name = 50003;
-}
+  string since = 50004;
+}

proto/prysm/v1alpha1/BUILD.bazel

@@ -214,6 +214,7 @@ ssz_proto_files(
         "beacon_state.proto",
         "sync_committee.proto",
         "withdrawals.proto",
+        "beacon_block_superset.proto",
     ],
     config = select({
         "//conditions:default": "mainnet",

proto/prysm/v1alpha1/beacon_block_superset.proto

@@ -0,0 +1,126 @@
+// Copyright 2023 Prysmatic Labs.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+syntax = "proto3";
+
+package ethereum.eth.v1alpha1;
+
+import "proto/eth/ext/options.proto";
+import "proto/prysm/v1alpha1/attestation.proto";
+import "proto/prysm/v1alpha1/beacon_block.proto";
+import "proto/prysm/v1alpha1/withdrawals.proto";
+import "proto/engine/v1/execution_engine.proto";
+
+option csharp_namespace = "Ethereum.Eth.v1alpha1";
+option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth";
+option java_multiple_files = true;
+option java_outer_classname = "BeaconBlockProto";
+option java_package = "org.ethereum.eth.v1alpha1";
+option php_namespace = "Ethereum\\Eth\\v1alpha1";
+
+// The Ethereum consensus beacon block. The message does not contain a validator signature.
+message SuperBeaconBlock {
+    // Beacon chain slot that this block represents.
+    uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"];
+
+    // Validator index of the validator that proposed the block header.
+    uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"];
+
+    // 32 byte root of the parent block.
+    bytes parent_root = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+
+    // 32 byte root of the resulting state after processing this block.
+    bytes state_root = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+
+    // The block body itself.
+    SuperBeaconBlockBody body = 5;
+}
+
+// The signed version of beacon block.
+message SignedSuperBeaconBlock {
+    // The unsigned beacon block itself.
+    SuperBeaconBlock block = 1;
+
+    // 96 byte BLS signature from the validator that produced this block.
+    bytes signature = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Signature"];
+}
+
+// The block body of an Ethereum consensus beacon block.
+message SuperBeaconBlockBody {
+    // The validators RANDAO reveal 96 byte value.
+    bytes randao_reveal = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Signature"];
+
+    // A reference to the Ethereum 1.x chain.
+    Eth1Data eth1_data = 2;
+
+    // 32 byte field of arbitrary data. This field may contain any data and
+    // is not used for anything other than a fun message.
+    bytes graffiti = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+
+    // Block operations
+    // Refer to spec constants at https://github.com/ethereum/consensus-specs/blob/dev/specs/core/0_beacon-chain.md#max-operations-per-block
+
+    // At most MAX_PROPOSER_SLASHINGS.
+    repeated ProposerSlashing proposer_slashings = 4;
+
+    // At most MAX_ATTESTER_SLASHINGS.
+    repeated AttesterSlashing attester_slashings = 5;
+
+    // At most MAX_ATTESTATIONS.
+    repeated Attestation attestations = 6;
+
+    // At most MAX_DEPOSITS.
+    repeated Deposit deposits = 7;
+
+    // At most MAX_VOLUNTARY_EXITS.
+    repeated SignedVoluntaryExit voluntary_exits = 8;
+
+    // Sync aggregate object to track sync committee votes for light client support.
+    SyncAggregate sync_aggregate = 9 [(ethereum.eth.ext.since) = "altair"];
+
+    SuperExecutionPayload execution_payload_data = 10 [(ethereum.eth.ext.since) = "bellatrix"];
+
+    repeated SignedBLSToExecutionChange bls_to_execution_changes = 11 [(ethereum.eth.ext.since) = "capella"];
+}
+
+message SuperExecutionPayload {
+    bytes parent_hash = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+    bytes fee_recipient = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+    bytes state_root = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+    bytes receipts_root = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+    bytes logs_bloom = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Bloom"];
+    bytes prev_randao = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+    uint64 block_number         = 7;
+    uint64 gas_limit            = 8;
+    uint64 gas_used             = 9;
+    uint64 timestamp            = 10;
+    bytes extra_data = 11;
+    bytes base_fee_per_gas = 12 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+    bytes block_hash = 13 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root"];
+    oneof transaction_data {
+        Txs txs = 14 [(ethereum.eth.ext.since) = "bellatrix"];
+        bytes transactions_root = 15 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root", (ethereum.eth.ext.since) = "bellatrix"];
+    }
+    oneof withdrawals_data {
+        WithdrawalsWrapper withdrawals_wrapper = 16 [(ethereum.eth.ext.since) = "capella"];
+        bytes withdrawals_root = 17 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Root", (ethereum.eth.ext.since) = "capella"];
+    }
+}
+
+message Txs {
+    repeated bytes transactions = 1;
+}
+
+message WithdrawalsWrapper {
+    repeated ethereum.engine.v1.Withdrawal withdrawals = 1;
+}