Resolve merge conflicts

This commit is contained in:
Eitan Seri- Levi
2026-01-27 22:49:08 -08:00
23 changed files with 1370 additions and 580 deletions

View File

@@ -81,7 +81,7 @@ pub use block_verification::{
BlockError, ExecutionPayloadError, ExecutionPendingBlock, GossipVerifiedBlock,
IntoExecutionPendingBlock, IntoGossipVerifiedBlock, InvalidSignature,
PayloadVerificationOutcome, PayloadVerificationStatus, build_blob_data_column_sidecars,
get_block_root,
get_block_root, signature_verify_chain_segment,
};
pub use block_verification_types::AvailabilityPendingExecutedBlock;
pub use block_verification_types::ExecutedBlock;