Fix rebase conflict

This commit is contained in:
Emilia Hane
2023-02-06 11:01:09 +01:00
parent a211e6afee
commit ce2db355de
7 changed files with 54 additions and 27 deletions

View File

@@ -125,7 +125,7 @@ pub struct BlobInfo {
/// The latest epoch that blobs were pruned.
pub last_pruned_epoch: Epoch,
/// The block root of the next blobs to prune from.
pub data_availability_breakpoint: Option<Hash256>,
pub data_availability_boundary: Option<Hash256>,
/// The block root of the next blob that needs to be added to fill in the history.
pub oldest_blob_parent: Hash256,
/// The slot before which blobs are available.