All ssz_static tests passing except DataColumnSidecar

This commit is contained in:
Michael Sproul
2026-01-20 14:22:16 +11:00
parent 7bf98d4ff6
commit ee0a8a93af
3 changed files with 5 additions and 3 deletions

View File

@@ -5,7 +5,7 @@ use bls::AggregateSignature;
use context_deserialize::context_deserialize; use context_deserialize::context_deserialize;
use educe::Educe; use educe::Educe;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use ssz::BitList; use ssz::BitVector;
use ssz_derive::{Decode, Encode}; use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom; use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash; use tree_hash_derive::TreeHash;
@@ -17,7 +17,7 @@ use tree_hash_derive::TreeHash;
#[educe(PartialEq, Hash)] #[educe(PartialEq, Hash)]
#[context_deserialize(ForkName)] #[context_deserialize(ForkName)]
pub struct PayloadAttestation<E: EthSpec> { pub struct PayloadAttestation<E: EthSpec> {
pub aggregation_bits: BitList<E::PTCSize>, pub aggregation_bits: BitVector<E::PTCSize>,
pub data: PayloadAttestationData, pub data: PayloadAttestationData,
pub signature: AggregateSignature, pub signature: AggregateSignature,
} }

View File

@@ -14,8 +14,10 @@ pub type BuilderIndex = u64;
)] )]
pub struct Builder { pub struct Builder {
pub pubkey: PublicKeyBytes, pub pubkey: PublicKeyBytes,
#[serde(with = "serde_utils::quoted_u8")]
pub version: u8, pub version: u8,
pub execution_address: Address, pub execution_address: Address,
#[serde(with = "serde_utils::quoted_u64")]
pub balance: u64, pub balance: u64,
pub deposit_epoch: Epoch, pub deposit_epoch: Epoch,
pub withdrawable_epoch: Epoch, pub withdrawable_epoch: Epoch,

View File

@@ -548,6 +548,7 @@ impl EthSpec for MinimalEthSpec {
type NumberOfColumns = U128; type NumberOfColumns = U128;
type ProposerLookaheadSlots = U16; // Derived from (MIN_SEED_LOOKAHEAD + 1) * SLOTS_PER_EPOCH type ProposerLookaheadSlots = U16; // Derived from (MIN_SEED_LOOKAHEAD + 1) * SLOTS_PER_EPOCH
type BuilderPendingPaymentsLimit = U16; // 2 * SLOTS_PER_EPOCH = 2 * 8 = 16 type BuilderPendingPaymentsLimit = U16; // 2 * SLOTS_PER_EPOCH = 2 * 8 = 16
type PTCSize = U2;
params_from_eth_spec!(MainnetEthSpec { params_from_eth_spec!(MainnetEthSpec {
JustificationBitsLength, JustificationBitsLength,
@@ -578,7 +579,6 @@ impl EthSpec for MinimalEthSpec {
MaxAttestationsElectra, MaxAttestationsElectra,
MaxDepositRequestsPerPayload, MaxDepositRequestsPerPayload,
MaxWithdrawalRequestsPerPayload, MaxWithdrawalRequestsPerPayload,
PTCSize,
MaxPayloadAttestations, MaxPayloadAttestations,
BuilderRegistryLimit BuilderRegistryLimit
}); });