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

resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2025-02-22 07:33:36 -08:00
parent fac71515e0 193061ff73
commit df0aeb0ba9
127 changed files with 4596 additions and 2671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,6 +158,7 @@ pub enum Error {
},
ZeroLengthTransaction,
PayloadBodiesByRangeNotSupported,
GetBlobsNotSupported,
InvalidJWTSecret(String),
InvalidForkForPayload,
InvalidPayloadBody(String),
@@ -1886,7 +1887,7 @@ impl<E: EthSpec> ExecutionLayer<E> {
.map_err(Box::new)
.map_err(Error::EngineError)
} else {
Ok(vec![None; query.len()])
Err(Error::GetBlobsNotSupported)
}
}
@@ -1915,11 +1916,18 @@ impl<E: EthSpec> ExecutionLayer<E> {
if let Some(builder) = self.builder() {
let (payload_result, duration) =
timed_future(metrics::POST_BLINDED_PAYLOAD_BUILDER, async {
builder
.post_builder_blinded_blocks(block)
.await
.map_err(Error::Builder)
.map(|d| d.data)
if builder.is_ssz_enabled() {
builder
.post_builder_blinded_blocks_ssz(block)
.await
.map_err(Error::Builder)
} else {
builder
.post_builder_blinded_blocks(block)
.await
.map_err(Error::Builder)
.map(|d| d.data)
}
})
.await;