gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-03 00:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
#8652


  This moves the `ExecutionBlockHash` from the `execution` module to the `core` module. This allows `core` to not depend on the `execution` module, and the `ExecutionBlockHash` is a pretty core  part of our types so I think it makes sense.


Co-Authored-By: Mac L <mjladson@pm.me>
This commit is contained in:
Mac L
2026-01-16 11:53:13 +04:00
committed by GitHub
parent 3903e1c67f
commit d099ad56fb
7 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
consensus/types/src/core/chain_spec.rs
View File

@@ -14,10 +14,9 @@ use tree_hash::TreeHash;
use crate::{ use crate::{
core::{ core::{
APPLICATION_DOMAIN_BUILDER, Address, ApplicationDomain, EnrForkId, Epoch, EthSpec, APPLICATION_DOMAIN_BUILDER, Address, ApplicationDomain, EnrForkId, Epoch, EthSpec,
EthSpecId, Hash256, MainnetEthSpec, Slot, Uint256, EthSpecId, ExecutionBlockHash, Hash256, MainnetEthSpec, Slot, Uint256,
}, },
data::{BlobIdentifier, DataColumnSubnetId, DataColumnsByRootIdentifier}, data::{BlobIdentifier, DataColumnSubnetId, DataColumnsByRootIdentifier},
execution::ExecutionBlockHash,
fork::{Fork, ForkData, ForkName}, fork::{Fork, ForkData, ForkName},
}; };

0
consensus/types/src/execution/execution_block_hash.rs → consensus/types/src/core/execution_block_hash.rs
View File

2
consensus/types/src/core/mod.rs
View File

@@ -5,6 +5,7 @@ mod chain_spec;
mod config_and_preset; mod config_and_preset;
mod enr_fork_id; mod enr_fork_id;
mod eth_spec; mod eth_spec;
mod execution_block_hash;
mod graffiti; mod graffiti;
mod non_zero_usize; mod non_zero_usize;
mod preset; mod preset;
@@ -25,6 +26,7 @@ pub use config_and_preset::{
}; };
pub use enr_fork_id::EnrForkId; pub use enr_fork_id::EnrForkId;
pub use eth_spec::{EthSpec, EthSpecId, GNOSIS, GnosisEthSpec, MainnetEthSpec, MinimalEthSpec}; 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 graffiti::{GRAFFITI_BYTES_LEN, Graffiti, GraffitiString};
pub use non_zero_usize::new_non_zero_usize; pub use non_zero_usize::new_non_zero_usize;
pub use preset::{ pub use preset::{

3
consensus/types/src/execution/execution_payload.rs
View File

@@ -10,8 +10,7 @@ use test_random_derive::TestRandom;
use tree_hash_derive::TreeHash; use tree_hash_derive::TreeHash;
use crate::{ use crate::{
core::{Address, EthSpec, Hash256}, core::{Address, EthSpec, ExecutionBlockHash, Hash256},
execution::ExecutionBlockHash,
fork::{ForkName, ForkVersionDecode}, fork::{ForkName, ForkVersionDecode},
state::BeaconStateError, state::BeaconStateError,
test_utils::TestRandom, test_utils::TestRandom,

7
consensus/types/src/execution/execution_payload_header.rs
View File

@@ -11,11 +11,10 @@ use tree_hash::TreeHash;
use tree_hash_derive::TreeHash; use tree_hash_derive::TreeHash;
use crate::{ use crate::{
core::{Address, EthSpec, Hash256, Uint256}, core::{Address, EthSpec, ExecutionBlockHash, Hash256, Uint256},
execution::{ execution::{
ExecutionBlockHash, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb,
ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadRef, ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadRef, Transactions,
Transactions,
}, },
fork::ForkName, fork::ForkName,
map_execution_payload_ref_into_execution_payload_header, map_execution_payload_ref_into_execution_payload_header,

2
consensus/types/src/execution/mod.rs
View File

@@ -1,5 +1,4 @@
mod eth1_data; mod eth1_data;
mod execution_block_hash;
mod execution_block_header; mod execution_block_header;
#[macro_use] #[macro_use]
mod execution_payload; mod execution_payload;
@@ -16,7 +15,6 @@ mod signed_execution_payload_envelope;
pub use bls_to_execution_change::BlsToExecutionChange; pub use bls_to_execution_change::BlsToExecutionChange;
pub use eth1_data::Eth1Data; pub use eth1_data::Eth1Data;
pub use execution_block_hash::ExecutionBlockHash;
pub use execution_block_header::{EncodableExecutionBlockHeader, ExecutionBlockHeader}; pub use execution_block_header::{EncodableExecutionBlockHeader, ExecutionBlockHeader};
pub use execution_payload::{ pub use execution_payload::{
ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb, ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb,

4
consensus/types/src/execution/payload.rs
View File

@@ -11,9 +11,9 @@ use tree_hash::TreeHash;
use tree_hash_derive::TreeHash; use tree_hash_derive::TreeHash;
use crate::{ use crate::{
core::{Address, EthSpec, Hash256}, core::{Address, EthSpec, ExecutionBlockHash, Hash256},
execution::{ execution::{
ExecutionBlockHash, ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella,
ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu,
ExecutionPayloadHeader, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella, ExecutionPayloadHeader, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella,
ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu, ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu,