Convert RpcBlock to an enum that indicates availability #8424

eserilev · 2025-11-17T19:28:58Z

RpcBlock

Convert RpcBlock into an enum with two variants:

`RpcBlock::FullyAvailable`

Indicates a fully available RPC block. An RpcBlock of this variant is guaranteed to have all blobs or the columns its required to custody. In the future we could move KZG verification as part of FullyAvailable construction validation logic so that we also have type safety guarntees that KZG verification for the block data is also valid

`RpcBlock::BlockOnly`

Indicates a maybe available block. No blob/column data has been fetched and we don't check if the block is expected to have any blob data. This variant is mostly used in lookup sync.

When constructing an RpcBlock the arguments provided decide wether its a FullyAvailable or BlocksOnly variant

pub fn new<T>(
        block: Arc<SignedBeaconBlock<E>>,
        block_data: Option<AvailableBlockData<E>>,
        da_checker: Arc<DataAvailabilityChecker<T>>,
        spec: Arc<ChainSpec>,
    ) -> Result<Self, AvailabilityCheckError>

if None is passed in for block_data this indicates a BlocksOnly variant. If a Some value is passed in it will be treated as a FullyAvailable variant. See below for the various block_data variants:

`AvailableBlockData`

pub enum AvailableBlockData<E: EthSpec> {
    /// Block is pre-Deneb or has zero blobs
    NoData,
    /// Block is post-Deneb, pre-PeerDAS and has more than zero blobs
    Blobs(BlobSidecarList<E>),
    /// Block is post-PeerDAS and has more than zero blobs
    DataColumns(DataColumnSidecarList<E>),
}

When constructing the different variants of AvailableBlockData the following checks are made

AvailableBlockData::NoData: no blobs are expected for the associated block
AvailableBlockData::Blobs: all expected blobs are present and the block is post-Deneb and pre-PeerDAS
AvailableBlockData::DataColumns: all expected data columns for the nodes custody requirements are present

mergify · 2025-11-17T19:38:35Z

Some required checks have failed. Could you please take a look @eserilev? 🙏

eserilev · 2025-11-17T19:43:39Z

need to fix a few tests but the general idea is here

…c-block-avail-varaint

mergify · 2025-12-01T15:50:40Z

Some required checks have failed. Could you please take a look @eserilev? 🙏

beginning changes

…c-block-avail-varaint

mergify · 2025-12-18T16:20:55Z

Some required checks have failed. Could you please take a look @eserilev? 🙏

ethDreamer · 2026-01-07T18:55:40Z

beacon_node/beacon_chain/src/block_verification_types.rs

-    /// viewed the same as `None` passed in.
-    pub fn new(
-        block_root: Option<Hash256>,
+    pub fn new<T>(


Add a comment above specifying when to use Some(block_data) or None

added comment

sorry where was this added? can't find it

whoops comments are now added: ab54242

ethDreamer · 2026-01-07T18:57:09Z

beacon_node/beacon_chain/src/data_availability_checker.rs


-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum AvailableBlockData<E: EthSpec> {


future refactor - move this to block_verification_types

ethDreamer · 2026-01-07T18:57:37Z

beacon_node/beacon_chain/src/data_availability_checker.rs

+        }
+    }
+}
+


future refactor - move to block_verification_types

ethDreamer · 2026-01-07T19:15:24Z

beacon_node/beacon_chain/tests/block_verification.rs

+// Test that `signature_verify_chain_segment` correctly handles a mix of `FullyAvailable`
+// and `BlockOnly` RpcBlocks. This situation should not happen in production
+// but this test may help catch potential future regressions.
+#[tokio::test]


flip this test

test is flipped

ethDreamer · 2026-01-07T19:16:56Z

beacon_node/beacon_chain/tests/block_verification.rs

+        assert_eq!(verified[i].block_root(), *expected_root);
+    }
+}
+


test for successfully importing blocks without columns (that need them) when past the data availability boundary

…/lighthouse into rpc-block-avail-varaint

mergify · 2026-01-08T17:04:55Z

Some required checks have failed. Could you please take a look @eserilev? 🙏

pawanjay176

Really clean! Thanks for fixing this up.
Just minor nits and a question

pawanjay176 · 2026-01-09T02:22:25Z

beacon_node/beacon_chain/src/block_verification_types.rs

-    /// viewed the same as `None` passed in.
-    pub fn new(
-        block_root: Option<Hash256>,
+    pub fn new<T>(


sorry where was this added? can't find it

pawanjay176 · 2026-01-09T02:29:44Z

beacon_node/beacon_chain/src/data_availability_checker.rs

-                        blobs_available_timestamp: None,
-                        spec: self.spec.clone(),
-                    })
+        for available_block in available_blocks {


maybe we can move this to before the kzg verification to avoid expensive verification if the batch doesn't have required data? not super necessary though

beacon_node/network/src/network_beacon_processor/sync_methods.rs

…/lighthouse into rpc-block-avail-varaint

Make RPCBlock a variant with an available and maybeavailable variants

09c15f0

eserilev added code-quality ready-for-review The code is ready for review syncing labels Nov 17, 2025

eserilev requested a review from ethDreamer November 17, 2025 19:29

mergify bot added waiting-on-author The reviewer has suggested changes and awaits thier implementation. and removed ready-for-review The code is ready for review labels Nov 17, 2025

eserilev added 10 commits November 18, 2025 19:15

Fix tests

d97a9ff

Fix tests

f92e1df

Merge branch 'unstable' of https://github.com/sigp/lighthouse into rp…

0ac040c

…c-block-avail-varaint

Fix tests

ba5a58e

Temp

545bf41

Fix

44e5672

Fix verify_kzg

aad7828

Fix test

6f07e44

Merge branch 'unstable' of https://github.com/sigp/lighthouse into rp…

00c0fe8

…c-block-avail-varaint

Update kzg block verif for list

2b3b923

eserilev marked this pull request as ready for review December 1, 2025 15:21

eserilev requested a review from jxs as a code owner December 1, 2025 15:21

eserilev added ready-for-review The code is ready for review and removed waiting-on-author The reviewer has suggested changes and awaits thier implementation. labels Dec 1, 2025

mergify bot added waiting-on-author The reviewer has suggested changes and awaits thier implementation. and removed ready-for-review The code is ready for review labels Dec 1, 2025

eserilev and others added 4 commits December 1, 2025 13:13

Fix

be9d7c9

beginning changes

1cb189b

Merge pull request #25 from ethDreamer/rpc-block-avail-refactor

e3517cc

beginning changes

Merge branch 'unstable' of https://github.com/sigp/lighthouse into rp…

632331a

…c-block-avail-varaint

Resolve TODO

0cd59ad

mergify bot added ready-for-review The code is ready for review and removed waiting-on-author The reviewer has suggested changes and awaits thier implementation. labels Dec 17, 2025

Update comments

886f875

mergify bot added waiting-on-author The reviewer has suggested changes and awaits thier implementation. and removed ready-for-review The code is ready for review labels Dec 18, 2025

eserilev added 2 commits December 19, 2025 10:34

Added new tests

d8be010

Lints

6c75930

mergify bot added ready-for-review The code is ready for review and removed waiting-on-author The reviewer has suggested changes and awaits thier implementation. labels Jan 6, 2026

ethDreamer reviewed Jan 7, 2026

View reviewed changes

eserilev added 3 commits January 7, 2026 14:59

Changes based on feedback

7f61d0d

Add new test

534cfad

Merge branch 'rpc-block-avail-varaint' of https://github.com/eserilev…

ccabb3c

…/lighthouse into rpc-block-avail-varaint

mergify bot added waiting-on-author The reviewer has suggested changes and awaits thier implementation. and removed ready-for-review The code is ready for review labels Jan 8, 2026

Fmt

5e4c454

eserilev added ready-for-review The code is ready for review and removed waiting-on-author The reviewer has suggested changes and awaits thier implementation. labels Jan 8, 2026

pawanjay176 approved these changes Jan 9, 2026

View reviewed changes

eserilev added 3 commits January 8, 2026 22:59

Added comments and a small refactor

ab54242

Merge branch 'rpc-block-avail-varaint' of https://github.com/eserilev…

30a51a1

…/lighthouse into rpc-block-avail-varaint

Merge branch 'unstable' into rpc-block-avail-varaint

7b54829

pawanjay176 approved these changes Jan 9, 2026

View reviewed changes

Convert RpcBlock to an enum that indicates availability #8424

Are you sure you want to change the base?

Convert RpcBlock to an enum that indicates availability #8424

Conversation

eserilev commented Nov 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

RpcBlock

RpcBlock::FullyAvailable

RpcBlock::BlockOnly

AvailableBlockData

Uh oh!

mergify bot commented Nov 17, 2025

Uh oh!

eserilev commented Nov 17, 2025

Uh oh!

mergify bot commented Dec 1, 2025

Uh oh!

mergify bot commented Dec 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mergify bot commented Jan 8, 2026

Uh oh!

pawanjay176 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

eserilev commented Nov 17, 2025 •

edited

Loading

`RpcBlock::FullyAvailable`

`RpcBlock::BlockOnly`

`AvailableBlockData`