Serialize altair fork epoch as u64::max

sigp · Aug 27, 2021 · 6e3b210 · 6e3b210
1 parent 0ef0cfd
commit 6e3b210
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/beacon_node/network/src/service.rs b/beacon_node/network/src/service.rs
@@ -619,7 +619,8 @@ fn spawn_service<T: BeaconChainTypes>(
                                                 "peer" => %source,
                                                 "fork_topic" => %topic,
                                             );
-                                            service.libp2p.report_peer(&source, PeerAction::LowToleranceError, ReportSource::Gossipsub);
+                                            // Penalize with MidTolerance to account for slight clock skews beyond `MAXIMUM_GOSSIP_CLOCK_DISPARITY`
+                                            service.libp2p.report_peer(&source, PeerAction::MidToleranceError, ReportSource::Gossipsub);
                                             service
                                                 .libp2p
                                                 .swarm

diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs
@@ -1,7 +1,7 @@
 use crate::*;
 use int_to_bytes::int_to_bytes4;
-use serde::Deserializer;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserializer, Serialize, Serializer};
+use serde_derive::Deserialize;
 use serde_utils::quoted_u64::MaybeQuoted;
 use std::fs::File;
 use std::path::Path;
@@ -545,8 +545,9 @@ pub struct Config {
 
     #[serde(with = "serde_utils::bytes_4_hex")]
     altair_fork_version: [u8; 4],
+    #[serde(serialize_with = "serialize_fork_epoch")]
     #[serde(deserialize_with = "deserialize_fork_epoch")]
-    altair_fork_epoch: Option<MaybeQuoted<Epoch>>,
+    pub altair_fork_epoch: Option<MaybeQuoted<Epoch>>,
 
     #[serde(with = "serde_utils::quoted_u64")]
     seconds_per_slot: u64,
@@ -584,6 +585,21 @@ impl Default for Config {
     }
 }
 
+/// Util function to serialize a `None` fork epoch value
+/// as `Epoch::max_value()`.
+fn serialize_fork_epoch<S>(val: &Option<MaybeQuoted<Epoch>>, s: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    match val {
+        None => MaybeQuoted {
+            value: Epoch::max_value(),
+        }
+        .serialize(s),
+        Some(epoch) => epoch.serialize(s),
+    }
+}
+
 /// Util function to deserialize a u64::max() fork epoch as `None`.
 fn deserialize_fork_epoch<'de, D>(deserializer: D) -> Result<Option<MaybeQuoted<Epoch>>, D::Error>
 where

diff --git a/consensus/types/src/fork_context.rs b/consensus/types/src/fork_context.rs
@@ -27,17 +27,12 @@ impl ForkContext {
         )];
 
         // Only add Altair to list of forks if it's enabled
-        // Note: `altair_fork_epoch = None | Some(Epoch::max_value())` implies altair hasn't been activated yet on the config.
-        if let Some(altair_epoch) = spec.altair_fork_epoch {
-            if altair_epoch != Epoch::max_value() {
-                fork_to_digest.push((
-                    ForkName::Altair,
-                    ChainSpec::compute_fork_digest(
-                        spec.altair_fork_version,
-                        genesis_validators_root,
-                    ),
-                ));
-            }
+        // Note: `altair_fork_epoch == None` implies altair hasn't been activated yet on the config.
+        if spec.altair_fork_epoch.is_some() {
+            fork_to_digest.push((
+                ForkName::Altair,
+                ChainSpec::compute_fork_digest(spec.altair_fork_version, genesis_validators_root),
+            ));
         }
 
         let fork_to_digest: HashMap<ForkName, [u8; 4]> = fork_to_digest.into_iter().collect();