Remove CGC from data_availability checker #7033
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dapplion
force-pushed
the
dedup-cgc-block
branch
from
32018b4 to
629d054
Compare
dapplion
commented
Feb 24, 2025
| @@ -104,6 +109,8 @@ impl<E: EthSpec> RpcBlock<E> { | |||
| Self { | |||
| block_root, | |||
| block: RpcBlockInner::Block(block), | |||
| // Block has zero columns | |||
| custody_columns_count: 0, | |||
There was a problem hiding this comment.
An RPC blocks without columns will never read this value
dapplion
commented
Feb 24, 2025
| if received_column_count >= total_column_count { | ||
| return ReconstructColumnsDecision::No("all columns received"); | ||
| } | ||
| // Only supernodes receive >= 50% of columns |
There was a problem hiding this comment.
Removed the "not required for full node" condition as it's redundant and would force us to pipe the custody group here somehow
dapplion
commented
Feb 24, 2025
| let mut expected_block_root = anchor_info.oldest_block_parent; | ||
| let mut prev_block_slot = anchor_info.oldest_block_slot; | ||
| let mut new_oldest_blob_slot = blob_info.oldest_blob_slot; | ||
| let mut new_oldest_data_column_slot = data_column_info.oldest_data_column_slot; | ||
|
|
||
| let mut blob_batch = Vec::<KeyValueStoreOp>::with_capacity(blob_batch_size); | ||
| let mut blob_batch = Vec::<KeyValueStoreOp>::new(); |
There was a problem hiding this comment.
Using with_capacity here feels like a micro-optimization unless I'm missing something. Dropped it as we don't have access to the column count here anymore
dapplion
commented
Feb 24, 2025
| @@ -815,6 +815,11 @@ where | |||
| (0..self.validator_keypairs.len()).collect() | |||
| } | |||
|
|
|||
| pub fn get_sampling_column_count(&self) -> usize { | |||
| // Default column custody count | |||
| 8 | |||
There was a problem hiding this comment.
This should have no effect on tests I believe
dapplion
commented
Feb 24, 2025
| block, | ||
| columns.clone(), | ||
| // TODO | ||
| columns.len(), |
There was a problem hiding this comment.
Assumes the CGC value is equal to all the columns received, which makes sense. We can change it later if we want to do more complex tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue Addressed
Validator custody makes the CGC and set of sampling columns dynamic. Right now this information is stored twice:
If that state becomes dynamic we must make sure it is in sync updating it twice, or guarding it behind a mutex. However, I noted that we don't really have to keep the CGC inside the data availability checker. All consumers can actually read it from the network globals, and we can update
make_availableto read the expected count of data columns from the block.