Skip to content

Fix block length calculation to return a Result type and handle errors appropriately #791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ToufeeqP merged 1 commit into from
Dec 4, 2025
+9 −4
Merged

Fix block length calculation to return a Result type and handle errors appropriately #791

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions node/src/da_block_import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use da_runtime::{
apis::{DataAvailApi, ExtensionBuilder},
Header as DaHeader,
};
use frame_system::limits::BlockLength;
use frame_system::limits::{BlockLength, BlockLengthError};

use sc_consensus::{
block_import::{BlockCheckParams, BlockImport as BlockImportT, BlockImportParams},
Expand Down Expand Up @@ -82,7 +82,7 @@ where
&self,
block: &BlockImportParams<B>,
) -> Result<(), ConsensusError> {
let block_len = extension_block_len(&block.header.extension);
let block_len = extension_block_len(&block.header.extension)?;
let extrinsics = || block.body.clone().unwrap_or_default();
let block_number: u32 = block.header.number;
let parent_hash = <B as BlockT>::Hash::from(block.header.parent_hash);
Expand Down Expand Up @@ -168,14 +168,14 @@ impl<B, C, I: Clone> Clone for BlockImport<B, C, I> {
}

/// Calculate block length from `extension`.
fn extension_block_len(extension: &HeaderExtension) -> BlockLength {
fn extension_block_len(extension: &HeaderExtension) -> Result<BlockLength, ConsensusError> {
BlockLength::with_normal_ratio(
BlockLengthRows(extension.rows() as u32),
BlockLengthColumns(extension.cols() as u32),
BLOCK_CHUNK_SIZE,
sp_runtime::Perbill::from_percent(90),
)
.expect("Valid BlockLength at genesis .qed")
.map_err(block_contains_invalid_block_length)
}

fn extension_mismatch(imported: &HeaderExtension, generated: &HeaderExtension) -> ConsensusError {
Expand All @@ -198,3 +198,8 @@ fn block_doesnt_contain_post_inherent() -> ConsensusError {
let msg = "Block does not contain post inherent".to_string();
ConsensusError::ClientImport(msg)
}

fn block_contains_invalid_block_length(err: BlockLengthError) -> ConsensusError {
let msg = format!("Block contains invalid block_length: {err:?}");
ConsensusError::ClientImport(msg)
}
Loading