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

Merge remote-tracking branch 'upstream/unstable' into electra_attestation_changes

Browse Source
This commit is contained in:
Mark Mackey
2024-05-02 18:22:34 -05:00
parent e6c7f145dd ee974db0ba
commit 3a41e137d1
156 changed files with 3625 additions and 4082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watch/src/database/mod.rs
View File

@@ -146,7 +146,7 @@ pub fn insert_beacon_block<E: EthSpec>(
let full_payload = block_message.execution_payload().ok();
let transaction_count: Option<i32> = if let Some(bellatrix_payload) =
full_payload.and_then(|payload| payload.execution_payload_merge().ok())
full_payload.and_then(|payload| payload.execution_payload_bellatrix().ok())
{
Some(bellatrix_payload.transactions.len() as i32)
} else {