gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 04:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

FMT

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-30 15:03:42 +02:00
parent 79c855a1c4
commit 2585096de6
39 changed files with 157 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_node/execution_layer/src/engine_api/json_structures.rs
View File

@@ -313,9 +313,7 @@ impl<E: EthSpec> TryFrom<ExecutionPayload<E>> for JsonExecutionPayload<E> {
ExecutionPayload::Gloas(payload) => {
Ok(JsonExecutionPayload::Gloas(payload.try_into()?))
}
ExecutionPayload::Heze(payload) => {
Ok(JsonExecutionPayload::Heze(payload.try_into()?))
}
ExecutionPayload::Heze(payload) => Ok(JsonExecutionPayload::Heze(payload.try_into()?)),
}
}
}
@@ -519,9 +517,7 @@ impl<E: EthSpec> TryFrom<JsonExecutionPayload<E>> for ExecutionPayload<E> {
JsonExecutionPayload::Gloas(payload) => {
Ok(ExecutionPayload::Gloas(payload.try_into()?))
}
JsonExecutionPayload::Heze(payload) => {
Ok(ExecutionPayload::Heze(payload.try_into()?))
}
JsonExecutionPayload::Heze(payload) => Ok(ExecutionPayload::Heze(payload.try_into()?)),
}
}
}
@@ -943,9 +939,7 @@ impl From<JsonPayloadAttributes> for PayloadAttributes {
inclusion_list_transactions: jpa
.inclusion_list_transactions
.into_iter()
.map(|s| {
hex::decode(s.strip_prefix("0x").unwrap_or(&s)).unwrap_or_default()
})
.map(|s| hex::decode(s.strip_prefix("0x").unwrap_or(&s)).unwrap_or_default())
.collect(),
}),
}

4
beacon_node/execution_layer/src/lib.rs
View File

@@ -55,8 +55,8 @@ use types::{
};
use types::{
BeaconStateError, BlindedPayload, ChainSpec, Epoch, ExecPayload, ExecutionPayloadBellatrix,
ExecutionPayloadCapella, ExecutionPayloadElectra,
ExecutionPayloadFulu, FullPayload, ProposerPreparationData, Slot,
ExecutionPayloadCapella, ExecutionPayloadElectra, ExecutionPayloadFulu, FullPayload,
ProposerPreparationData, Slot,
};
mod block_hash;

11
beacon_node/execution_layer/src/test_utils/execution_block_generator.rs
View File

@@ -1091,15 +1091,8 @@ mod test {
const TERMINAL_BLOCK: u64 = 10;
const DIFFICULTY_INCREMENT: u64 = 1;
let mut generator: ExecutionBlockGenerator<MainnetEthSpec> = ExecutionBlockGenerator::new(
None,
None,
None,
None,
None,
None,
None,
);
let mut generator: ExecutionBlockGenerator<MainnetEthSpec> =
ExecutionBlockGenerator::new(None, None, None, None, None, None, None);
generator.terminal_total_difficulty = Uint256::from(TERMINAL_DIFFICULTY);
generator.terminal_block_number = TERMINAL_BLOCK;

4
beacon_node/execution_layer/src/test_utils/mock_builder.rs
View File

@@ -30,8 +30,8 @@ use tracing::{debug, error, info, warn};
use tree_hash::TreeHash;
use types::ExecutionBlockHash;
use types::builder::{
BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb,
BuilderBidElectra, BuilderBidFulu, SignedBuilderBid,
BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, BuilderBidElectra,
BuilderBidFulu, SignedBuilderBid,
};
use types::{
Address, BeaconState, ChainSpec, Epoch, EthSpec, ExecPayload, ExecutionPayload,