feat: make more block types generic #12812
Open
+490
−289
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
emhane
requested changes
Nov 24, 2024
| @@ -144,7 +145,7 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> { | |||
| for block in blocks.into_iter().rev() { | |||
| let block_number = block.number; | |||
| let sealed_block = block | |||
| .try_seal_with_senders() | |||
| .try_seal_with_senders::<<N::Primitives as NodePrimitives>::Block>() | |||
There was a problem hiding this comment.
Suggested change
| .try_seal_with_senders::<<N::Primitives as NodePrimitives>::Block>() | |
| .try_seal_with_senders::<BlockTy<N>>() |
add another type alias here for BlockTy
reth/crates/node/types/src/lib.rs
Lines 236 to 243 in 6695d07
emhane
requested changes
Nov 24, 2024
crates/primitives/src/traits.rs
Outdated
| /// Extension trait for [`reth_primitives_traits::Block`] implementations | ||
| /// allowing for conversions into common block parts containers such as [`SealedBlock`], | ||
| /// [`BlockWithSenders`], etc. | ||
| pub trait BlockSealExt: Block { |
There was a problem hiding this comment.
this name is better as either BlockSeal or BlockExt
There was a problem hiding this comment.
renamed to BlockExt in d54846d
emhane
requested changes
Nov 24, 2024
| @@ -33,7 +33,7 @@ pub fn setup_without_evm<Provider>( | |||
| where | |||
| Provider: StaticFileProviderFactory | |||
| + StageCheckpointWriter | |||
| + BlockWriter<Body: reth_node_api::BlockBody>, | |||
| + BlockWriter<Block: reth_node_api::Block<Header = reth_primitives::Header>>, | |||
There was a problem hiding this comment.
Suggested change
| + BlockWriter<Block: reth_node_api::Block<Header = reth_primitives::Header>>, | |
| + BlockWriter<BlockHeader = reth_primitives::Header>, |
There was a problem hiding this comment.
BlockWriter doesn't have this AT
| @@ -64,7 +64,8 @@ fn append_first_block<Provider>( | |||
| total_difficulty: U256, | |||
| ) -> Result<(), eyre::Error> | |||
| where | |||
| Provider: BlockWriter<Body: reth_node_api::BlockBody> + StaticFileProviderFactory, | |||
| Provider: BlockWriter<Block: reth_node_api::Block<Header = reth_primitives::Header>> | |||
There was a problem hiding this comment.
Suggested change
| Provider: BlockWriter<Block: reth_node_api::Block<Header = reth_primitives::Header>> | |
| Provider: BlockWriter<BlockHeader = reth_primitives::Header> |
crates/primitives/src/block.rs
Outdated
| @@ -204,72 +152,83 @@ impl<'a> arbitrary::Arbitrary<'a> for Block { | |||
|
|
|||
| /// Sealed block with senders recovered from transactions. | |||
| #[derive(Debug, Clone, PartialEq, Eq, Default, Deref, DerefMut)] | |||
| pub struct BlockWithSenders { | |||
| pub struct BlockWithSenders<B: reth_primitives_traits::Block = Block> { | |||
There was a problem hiding this comment.
Suggested change
| pub struct BlockWithSenders<B: reth_primitives_traits::Block = Block> { | |
| pub struct BlockWithSenders<B = Block> { |
it's always better to not constraint the generic in the type definition with a trait bound that implements a bunch of behaviour (ie trait methods), makes the code more flexible in testing
| /// List of senders that match the transactions in the block | ||
| pub senders: Vec<Address>, | ||
| } | ||
|
|
||
| impl BlockWithSenders { | ||
| impl<B: reth_primitives_traits::Block> BlockWithSenders<B> { |
klkvr
force-pushed
the
klkvr/generic-blocks
branch
from
9a090bf
to
94d8acd
Compare
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.
Preparation for abstraction of block readers
Changes in this PR:
Blockstruct are moved to a new extension traitBlockSealExtwhich is implemented for everyBlocktrait implementations, allowing them to be called once we abstract the block typeBlockWriterAT is changed fromBodytoBlockBlockWithSendersandSealedBlockWithSendersare made generic over a singleB: Blockgeneric.SealedBlockis still generic over both. This is a bit tricky to simplify because some of the networking components which construct blocks only know separate header and body types when constructingSealedBlock, and converting those 2 generics to a single one would need an additional generic for those types. One of such components isBodiesDownloaderwhich usesBodiesRequestFuture:reth/crates/net/downloaders/src/bodies/request.rs
Line 40 in f61a764
This issue doesn't apply to other components because they usually receive full blocks