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

resolve merge conlfict

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-23 02:15:26 +09:00
parent 20f0c7bf4b cfc748309f
commit 755b8d8510
148 changed files with 5482 additions and 1846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_node/http_api/src/beacon/execution_payload_envelope.rs
View File

@@ -95,7 +95,7 @@ pub async fn publish_execution_payload_envelope<T: BeaconChainTypes>(
chain: Arc<BeaconChain<T>>,
network_tx: &UnboundedSender<NetworkMessage<T::EthSpec>>,
) -> Result<Response<Body>, Rejection> {
let slot = envelope.message.slot;
let slot = envelope.slot();
let beacon_block_root = envelope.message.beacon_block_root;
let builder_index = envelope.message.builder_index;
@@ -198,9 +198,7 @@ pub(crate) fn get_beacon_execution_payload_envelope<T: BeaconChainTypes>(
))
})?;
let fork_name = chain
.spec
.fork_name_at_slot::<T::EthSpec>(envelope.message.slot);
let fork_name = chain.spec.fork_name_at_slot::<T::EthSpec>(envelope.slot());
match accept_header {
Some(api_types::Accept::Ssz) => Response::builder()