cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix conflicts rebasing eip4844

Browse Source
This commit is contained in:
Emilia Hane 2023-02-06 11:11:02 +01:00
parent b2abec5d35
commit 56c84178f2
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3024,7 +3024,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
// Only store blobs at the data availability boundary, minus any configured epochs // Only store blobs at the data availability boundary, minus any configured epochs
// margin, or younger (of higher epoch number). // margin, or younger (of higher epoch number).
if block_epoch >= import_boundary { if block_epoch >= import_boundary {
if let Some(blobs) = blobs? { if let Some(blobs) = blobs {
if blobs.blobs.len() > 0 { if blobs.blobs.len() > 0 {
//FIXME(sean) using this for debugging for now //FIXME(sean) using this for debugging for now
info!(self.log, "Writing blobs to store"; "block_root" => ?block_root); info!(self.log, "Writing blobs to store"; "block_root" => ?block_root);

10
beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
View File

@ -688,12 +688,10 @@ impl<T: BeaconChainTypes> Worker<T> {
let serve_blobs_from_slot = if start_epoch < data_availability_boundary { let serve_blobs_from_slot = if start_epoch < data_availability_boundary {
// Attempt to serve from the earliest block in our database, falling back to the data // Attempt to serve from the earliest block in our database, falling back to the data
// availability boundary // availability boundary
let oldest_blob_slot = self let oldest_blob_slot =
.chain self.chain.store.get_blob_info().oldest_blob_slot.unwrap_or(
.store data_availability_boundary.start_slot(T::EthSpec::slots_per_epoch()),
.get_blob_info() );
.map(|blob_info| blob_info.oldest_blob_slot)
.unwrap_or(data_availability_boundary.start_slot(T::EthSpec::slots_per_epoch()));
debug!( debug!(
self.log, self.log,