Resolve merge conflicts

This commit is contained in:
Eitan Seri-Levi
2026-06-25 14:59:08 +03:00
54 changed files with 1351 additions and 1207 deletions

View File

@@ -1124,7 +1124,8 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
)?;
// Prune blobs in the background.
if let Some(data_availability_boundary) = self.data_availability_boundary() {
if let Some(data_availability_boundary) = self.custody_context.data_availability_boundary()
{
self.store_migrator
.process_prune_blobs(data_availability_boundary);
}