Skip to content

chore: simplify rpc ro primitive block impls #16487

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
merged 3 commits into from
May 27, 2025
Merged

chore: simplify rpc ro primitive block impls #16487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89ceb1e
chore: simplify rpc ro primitive block impls
mattsse May 26, 2025
c6aea5e
Merge branch 'main' into matt/simplify-debug-node-rpc-conversion
mattsse May 27, 2025
8b05215
simplify
mattsse May 27, 2025
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: 1 addition & 12 deletions crates/ethereum/node/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,18 +275,7 @@ impl<N: FullNodeComponents<Types = Self>> DebugNode<N> for EthereumNode {
type RpcBlock = alloy_rpc_types_eth::Block;

fn rpc_to_primitive_block(rpc_block: Self::RpcBlock) -> reth_ethereum_primitives::Block {
let alloy_rpc_types_eth::Block { header, transactions, withdrawals, .. } = rpc_block;
reth_ethereum_primitives::Block {
header: header.inner,
body: reth_ethereum_primitives::BlockBody {
transactions: transactions
.into_transactions()
.map(|tx| tx.inner.into_inner().into())
.collect(),
ommers: Default::default(),
withdrawals,
},
}
rpc_block.into_consensus().convert_transactions()
}
}

Expand Down
9 changes: 1 addition & 8 deletions crates/optimism/node/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,7 @@ where
type RpcBlock = alloy_rpc_types_eth::Block<op_alloy_consensus::OpTxEnvelope>;

fn rpc_to_primitive_block(rpc_block: Self::RpcBlock) -> reth_node_api::BlockTy<Self> {
let alloy_rpc_types_eth::Block { header, transactions, .. } = rpc_block;
reth_optimism_primitives::OpBlock {
header: header.inner,
body: reth_optimism_primitives::OpBlockBody {
transactions: transactions.into_transactions().collect(),
..Default::default()
},
}
rpc_block.into_consensus()
}
}

Expand Down
Loading