Skip to content

Remove execution dependency from core module in consensus/types #8666

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
mergify merged 2 commits into from
Jan 16, 2026
Merged

Remove execution dependency from core module in consensus/types #8666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c65e10
Remove execution dependency in type core module
macladson Jan 13, 2026
277dfaf
Merge branch 'unstable' into remove-execution-dep-from-core-types
macladson Jan 16, 2026
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
3 changes: 1 addition & 2 deletions consensus/types/src/core/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ use tree_hash::TreeHash;
use crate::{
core::{
APPLICATION_DOMAIN_BUILDER, Address, ApplicationDomain, EnrForkId, Epoch, EthSpec,
EthSpecId, Hash256, MainnetEthSpec, Slot, Uint256,
EthSpecId, ExecutionBlockHash, Hash256, MainnetEthSpec, Slot, Uint256,
},
data::{BlobIdentifier, DataColumnSubnetId, DataColumnsByRootIdentifier},
execution::ExecutionBlockHash,
fork::{Fork, ForkData, ForkName},
};

Expand Down
0 ...pes/src/execution/execution_block_hash.rs → ...us/types/src/core/execution_block_hash.rs
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions consensus/types/src/core/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ mod chain_spec;
mod config_and_preset;
mod enr_fork_id;
mod eth_spec;
mod execution_block_hash;
mod graffiti;
mod non_zero_usize;
mod preset;
Expand All @@ -25,6 +26,7 @@ pub use config_and_preset::{
};
pub use enr_fork_id::EnrForkId;
pub use eth_spec::{EthSpec, EthSpecId, GNOSIS, GnosisEthSpec, MainnetEthSpec, MinimalEthSpec};
pub use execution_block_hash::ExecutionBlockHash;
pub use graffiti::{GRAFFITI_BYTES_LEN, Graffiti, GraffitiString};
pub use non_zero_usize::new_non_zero_usize;
pub use preset::{
Expand Down
3 changes: 1 addition & 2 deletions consensus/types/src/execution/execution_payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash;

use crate::{
core::{Address, EthSpec, Hash256},
execution::ExecutionBlockHash,
core::{Address, EthSpec, ExecutionBlockHash, Hash256},
fork::{ForkName, ForkVersionDecode},
state::BeaconStateError,
test_utils::TestRandom,
Expand Down
7 changes: 3 additions & 4 deletions consensus/types/src/execution/execution_payload_header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ use tree_hash::TreeHash;
use tree_hash_derive::TreeHash;

use crate::{
core::{Address, EthSpec, Hash256, Uint256},
core::{Address, EthSpec, ExecutionBlockHash, Hash256, Uint256},
execution::{
ExecutionBlockHash, ExecutionPayloadBellatrix, ExecutionPayloadCapella,
ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadRef,
Transactions,
ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb,
ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadRef, Transactions,
},
fork::ForkName,
map_execution_payload_ref_into_execution_payload_header,
Expand Down
2 changes: 0 additions & 2 deletions consensus/types/src/execution/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
mod eth1_data;
mod execution_block_hash;
mod execution_block_header;
#[macro_use]
mod execution_payload;
Expand All @@ -16,7 +15,6 @@ mod signed_execution_payload_envelope;

pub use bls_to_execution_change::BlsToExecutionChange;
pub use eth1_data::Eth1Data;
pub use execution_block_hash::ExecutionBlockHash;
pub use execution_block_header::{EncodableExecutionBlockHeader, ExecutionBlockHeader};
pub use execution_payload::{
ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb,
Expand Down
4 changes: 2 additions & 2 deletions consensus/types/src/execution/payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ use tree_hash::TreeHash;
use tree_hash_derive::TreeHash;

use crate::{
core::{Address, EthSpec, Hash256},
core::{Address, EthSpec, ExecutionBlockHash, Hash256},
execution::{
ExecutionBlockHash, ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella,
ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella,
ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu,
ExecutionPayloadHeader, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella,
ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu,
Expand Down