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

Merge branch 'deneb-free-blobs' of https://github.com/sigp/lighthouse into some-blob-reprocessing-work

Browse Source
This commit is contained in:
realbigsean
2023-04-27 14:19:42 -04:00
parent d224fce084 c1d47da02d
commit eadf293419
24 changed files with 450 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@@ -4722,7 +4722,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
bls_to_execution_changes,
} = partial_beacon_block;
let (inner_block, blobs_opt) = match &state {
let (inner_block, blobs_opt, proofs_opt) = match &state {
BeaconState::Base(_) => (
BeaconBlock::Base(BeaconBlockBase {
slot,
@@ -4742,6 +4742,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
},
}),
None,
None,
),
BeaconState::Altair(_) => (
BeaconBlock::Altair(BeaconBlockAltair {
@@ -4764,9 +4765,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
},
}),
None,
None,
),
BeaconState::Merge(_) => {
let (payload, _, _) = block_contents
let (payload, _, _, _) = block_contents
.ok_or(BlockProductionError::MissingExecutionPayload)?
.deconstruct();
(
@@ -4792,10 +4794,11 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
},
}),
None,
None,
)
}
BeaconState::Capella(_) => {
let (payload, _, _) = block_contents
let (payload, _, _, _) = block_contents
.ok_or(BlockProductionError::MissingExecutionPayload)?
.deconstruct();
(
@@ -4822,10 +4825,11 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
},
}),
None,
None,
)
}
BeaconState::Deneb(_) => {
let (payload, kzg_commitments, blobs) = block_contents
let (payload, kzg_commitments, blobs, proofs) = block_contents
.ok_or(BlockProductionError::MissingExecutionPayload)?
.deconstruct();
(
@@ -4854,6 +4858,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
},
}),
blobs,
proofs,
)
}
};
@@ -4926,8 +4931,11 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
)));
}
let kzg_proofs =
Self::compute_blob_kzg_proofs(kzg, &blobs, expected_kzg_commitments, slot)?;
let kzg_proofs = if let Some(proofs) = proofs_opt {
Vec::from(proofs)
} else {
Self::compute_blob_kzg_proofs(kzg, &blobs, expected_kzg_commitments, slot)?
};
kzg_utils::validate_blobs::<T::EthSpec>(
kzg,