From 55951bb45fc3a8b58ea67ea96cce4e98bc5e0b20 Mon Sep 17 00:00:00 2001 From: shane-moore Date: Tue, 29 Jul 2025 20:34:03 -0700 Subject: [PATCH] updates per pr review --- consensus/types/src/eth_spec.rs | 6 +++--- consensus/types/src/execution_bid.rs | 13 ++----------- consensus/types/src/payload_attestation_data.rs | 1 - 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/consensus/types/src/eth_spec.rs b/consensus/types/src/eth_spec.rs index 0f1e03a73d..5b8a80290a 100644 --- a/consensus/types/src/eth_spec.rs +++ b/consensus/types/src/eth_spec.rs @@ -75,7 +75,6 @@ pub trait EthSpec: 'static + Default + Sync + Send + Clone + Debug + PartialEq + type EpochsPerSlashingsVector: Unsigned + Clone + Sync + Send + Debug + PartialEq; type HistoricalRootsLimit: Unsigned + Clone + Sync + Send + Debug + PartialEq; type ValidatorRegistryLimit: Unsigned + Clone + Sync + Send + Debug + PartialEq; - type BuilderPendingWithdrawalsLimit: Unsigned + Clone + Sync + Send + Debug + PartialEq; /* * Max operations per block */ @@ -171,6 +170,7 @@ pub trait EthSpec: 'static + Default + Sync + Send + Clone + Debug + PartialEq + */ type PTCSize: Unsigned + Clone + Sync + Send + Debug + PartialEq; type MaxPayloadAttestations: Unsigned + Clone + Sync + Send + Debug + PartialEq; + type BuilderPendingWithdrawalsLimit: Unsigned + Clone + Sync + Send + Debug + PartialEq; fn default_spec() -> ChainSpec; @@ -481,7 +481,7 @@ impl EthSpec for MainnetEthSpec { type MaxAttestationsElectra = U8; type MaxWithdrawalRequestsPerPayload = U16; type MaxPendingDepositsPerEpoch = U16; - type PTCSize = U64; // todo: verify if needs to be U512 for some reason like in Mark's OG implementation + type PTCSize = U512; type MaxPayloadAttestations = U2; fn default_spec() -> ChainSpec { @@ -628,7 +628,7 @@ impl EthSpec for GnosisEthSpec { type CellsPerExtBlob = U128; type NumberOfColumns = U128; type ProposerLookaheadSlots = U32; // Derived from (MIN_SEED_LOOKAHEAD + 1) * SLOTS_PER_EPOCH - type PTCSize = U64; // todo: verify if needs to be U512 for some reason like in Mark's OG implementation + type PTCSize = U512; type MaxPayloadAttestations = U2; fn default_spec() -> ChainSpec { diff --git a/consensus/types/src/execution_bid.rs b/consensus/types/src/execution_bid.rs index 9bbabf10ca..80f9d7684a 100644 --- a/consensus/types/src/execution_bid.rs +++ b/consensus/types/src/execution_bid.rs @@ -6,16 +6,7 @@ use test_random_derive::TestRandom; use tree_hash_derive::TreeHash; #[derive( - Default, - Debug, - Clone, - Serialize, - Encode, - Decode, - Deserialize, - TreeHash, - Derivative, - TestRandom, + Default, Debug, Clone, Serialize, Encode, Decode, Deserialize, TreeHash, Derivative, TestRandom, )] #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[derivative(PartialEq, Hash)] @@ -26,7 +17,7 @@ pub struct ExecutionBid { pub parent_block_root: Hash256, pub block_hash: ExecutionBlockHash, #[serde(with = "serde_utils::address_hex")] - pub fee_recipient: Address, // todo(eip-7732): verify if this needs address_hex serialization + pub fee_recipient: Address, #[serde(with = "serde_utils::quoted_u64")] pub gas_limit: u64, #[serde(with = "serde_utils::quoted_u64")] diff --git a/consensus/types/src/payload_attestation_data.rs b/consensus/types/src/payload_attestation_data.rs index 5962bfeb23..a25e676392 100644 --- a/consensus/types/src/payload_attestation_data.rs +++ b/consensus/types/src/payload_attestation_data.rs @@ -15,7 +15,6 @@ pub struct PayloadAttestationData { pub slot: Slot, pub payload_present: bool, } -// todo(eip-7732): Mark's implementation has PayloadStatus as an enum, but spec calls for a bool. Need to clarify this. impl SignedRoot for PayloadAttestationData {}