Return an error based on the Deneb fork

paulhauner · Jan 8, 2024 · 2dfc4b1 · 2dfc4b1
1 parent 0153572
commit 2dfc4b1
Showing 1 changed file with 27 additions and 22 deletions.
diff --git a/beacon_node/client/src/builder.rs b/beacon_node/client/src/builder.rs
@@ -267,28 +267,33 @@ where
                 // verify blob availability by downloading blobs from the P2P
                 // network. The user should do a checkpoint sync instead.
                 if !config.allow_insecure_genesis_sync {
-                    let now = SystemTime::now()
-                        .duration_since(UNIX_EPOCH)
-                        .map_err(|e| format!("Unable to read system time: {e:}"))?
-                        .as_secs();
-                    let genesis_time = genesis_state.genesis_time();
-                    // Shrink the blob availability window so users don't start
-                    // a sync right before blobs start to disappear from the P2P
-                    // network.
-                    let reduced_p2p_availability_epochs = MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS
-                        .as_u64()
-                        .saturating_sub(BLOB_AVAILABILITY_REDUCTION_EPOCHS);
-                    let blob_availability_window = reduced_p2p_availability_epochs
-                        * TEthSpec::slots_per_epoch()
-                        * spec.seconds_per_slot;
-
-                    if now > genesis_time + blob_availability_window {
-                        return Err(
-                                "Syncing from genesis is insecure and incompatible with data availability checks. \
-                                You should instead perform a checkpoint sync from a trusted node using the --checkpoint-sync-url option. \
-                                For a list of public endpoints, see:\nhttps://eth-clients.github.io/checkpoint-sync-endpoints/"
-                                    .to_string(),
-                            );
+                    if let Some(deneb_fork_epoch) = spec.deneb_fork_epoch {
+                        let now = SystemTime::now()
+                            .duration_since(UNIX_EPOCH)
+                            .map_err(|e| format!("Unable to read system time: {e:}"))?
+                            .as_secs();
+                        let genesis_time = genesis_state.genesis_time();
+                        let deneb_time =
+                            genesis_time + (deneb_fork_epoch.as_u64() * spec.seconds_per_slot);
+
+                        // Shrink the blob availability window so users don't start
+                        // a sync right before blobs start to disappear from the P2P
+                        // network.
+                        let reduced_p2p_availability_epochs = MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS
+                            .as_u64()
+                            .saturating_sub(BLOB_AVAILABILITY_REDUCTION_EPOCHS);
+                        let blob_availability_window = reduced_p2p_availability_epochs
+                            * TEthSpec::slots_per_epoch()
+                            * spec.seconds_per_slot;
+
+                        if now > deneb_time + blob_availability_window {
+                            return Err(
+                                    "Syncing from genesis is insecure and incompatible with data availability checks. \
+                                    You should instead perform a checkpoint sync from a trusted node using the --checkpoint-sync-url option. \
+                                    For a list of public endpoints, see:\nhttps://eth-clients.github.io/checkpoint-sync-endpoints/"
+                                        .to_string(),
+                                );
+                        }
                     }
                 }