From ee0a8a93af82a1bd340eac9412264e08b16c611d Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Tue, 20 Jan 2026 14:22:16 +1100
Subject: [PATCH] All ssz_static tests passing except DataColumnSidecar

---
 consensus/types/src/attestation/payload_attestation.rs | 4 ++--
 consensus/types/src/builder/builder.rs                 | 2 ++
 consensus/types/src/core/eth_spec.rs                   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/consensus/types/src/attestation/payload_attestation.rs b/consensus/types/src/attestation/payload_attestation.rs
index 192a4a8fea..115a5ec4d6 100644
--- a/consensus/types/src/attestation/payload_attestation.rs
+++ b/consensus/types/src/attestation/payload_attestation.rs
@@ -5,7 +5,7 @@ use bls::AggregateSignature;
 use context_deserialize::context_deserialize;
 use educe::Educe;
 use serde::{Deserialize, Serialize};
-use ssz::BitList;
+use ssz::BitVector;
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;
@@ -17,7 +17,7 @@ use tree_hash_derive::TreeHash;
 #[educe(PartialEq, Hash)]
 #[context_deserialize(ForkName)]
 pub struct PayloadAttestation<E: EthSpec> {
-    pub aggregation_bits: BitList<E::PTCSize>,
+    pub aggregation_bits: BitVector<E::PTCSize>,
     pub data: PayloadAttestationData,
     pub signature: AggregateSignature,
 }
diff --git a/consensus/types/src/builder/builder.rs b/consensus/types/src/builder/builder.rs
index 54891cd8d8..81ca45046c 100644
--- a/consensus/types/src/builder/builder.rs
+++ b/consensus/types/src/builder/builder.rs
@@ -14,8 +14,10 @@ pub type BuilderIndex = u64;
 )]
 pub struct Builder {
     pub pubkey: PublicKeyBytes,
+    #[serde(with = "serde_utils::quoted_u8")]
     pub version: u8,
     pub execution_address: Address,
+    #[serde(with = "serde_utils::quoted_u64")]
     pub balance: u64,
     pub deposit_epoch: Epoch,
     pub withdrawable_epoch: Epoch,
diff --git a/consensus/types/src/core/eth_spec.rs b/consensus/types/src/core/eth_spec.rs
index ac20c1abdf..5160b4c813 100644
--- a/consensus/types/src/core/eth_spec.rs
+++ b/consensus/types/src/core/eth_spec.rs
@@ -548,6 +548,7 @@ impl EthSpec for MinimalEthSpec {
     type NumberOfColumns = U128;
     type ProposerLookaheadSlots = U16; // Derived from (MIN_SEED_LOOKAHEAD + 1) * SLOTS_PER_EPOCH
     type BuilderPendingPaymentsLimit = U16; // 2 * SLOTS_PER_EPOCH = 2 * 8 = 16
+    type PTCSize = U2;
 
     params_from_eth_spec!(MainnetEthSpec {
         JustificationBitsLength,
@@ -578,7 +579,6 @@ impl EthSpec for MinimalEthSpec {
         MaxAttestationsElectra,
         MaxDepositRequestsPerPayload,
         MaxWithdrawalRequestsPerPayload,
-        PTCSize,
         MaxPayloadAttestations,
         BuilderRegistryLimit
     });