Also persist epoch to custody_count in CustodyContext

pawanjay176 · pawanjay176 · commit 47d76bee4cb6 · 2025-06-27T15:52:45.000-07:00
diff --git a/beacon_node/beacon_chain/src/validator_custody.rs b/beacon_node/beacon_chain/src/validator_custody.rs
@@ -163,7 +163,13 @@ impl CustodyContext {
             validator_custody_count: AtomicU64::new(ssz_context.validator_custody_at_head),
             current_is_supernode: is_supernode,
             persisted_is_supernode: ssz_context.persisted_is_supernode,
-            validator_registrations: Default::default(),
+            validator_registrations: RwLock::new(ValidatorRegistrations {
+                validators: Default::default(),
+                epoch_validator_custody_requirements: ssz_context
+                    .epoch_validator_custody_requirements
+                    .into_iter()
+                    .collect(),
+            }),
         }
     }
 
@@ -265,13 +271,21 @@ pub struct CustodyCountChanged {
 pub struct CustodyContextSsz {
     validator_custody_at_head: u64,
     persisted_is_supernode: bool,
+    epoch_validator_custody_requirements: Vec<(Epoch, u64)>,
 }
 
 impl From<&CustodyContext> for CustodyContextSsz {
     fn from(context: &CustodyContext) -> Self {
         CustodyContextSsz {
             validator_custody_at_head: context.validator_custody_count.load(Ordering::Relaxed),
             persisted_is_supernode: context.persisted_is_supernode,
+            epoch_validator_custody_requirements: context
+                .validator_registrations
+                .read()
+                .epoch_validator_custody_requirements
+                .iter()
+                .map(|(epoch, count)| (*epoch, *count))
+                .collect(),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,13 @@ impl CustodyContext {`
`163`	`163`	`validator_custody_count: AtomicU64::new(ssz_context.validator_custody_at_head),`
`164`	`164`	`current_is_supernode: is_supernode,`
`165`	`165`	`persisted_is_supernode: ssz_context.persisted_is_supernode,`
`166`		`- validator_registrations: Default::default(),`
	`166`	`+ validator_registrations: RwLock::new(ValidatorRegistrations {`
	`167`	`+ validators: Default::default(),`
	`168`	`+ epoch_validator_custody_requirements: ssz_context`
	`169`	`+ .epoch_validator_custody_requirements`
	`170`	`+ .into_iter()`
	`171`	`+ .collect(),`
	`172`	`+ }),`
`167`	`173`	`}`
`168`	`174`	`}`
`169`	`175`
`@@ -265,13 +271,21 @@ pub struct CustodyCountChanged {`
`265`	`271`	`pub struct CustodyContextSsz {`
`266`	`272`	`validator_custody_at_head: u64,`
`267`	`273`	`persisted_is_supernode: bool,`
	`274`	`+ epoch_validator_custody_requirements: Vec<(Epoch, u64)>,`
`268`	`275`	`}`
`269`	`276`
`270`	`277`	`impl From<&CustodyContext> for CustodyContextSsz {`
`271`	`278`	`fn from(context: &CustodyContext) -> Self {`
`272`	`279`	`CustodyContextSsz {`
`273`	`280`	`validator_custody_at_head: context.validator_custody_count.load(Ordering::Relaxed),`
`274`	`281`	`persisted_is_supernode: context.persisted_is_supernode,`
	`282`	`+ epoch_validator_custody_requirements: context`
	`283`	`+ .validator_registrations`
	`284`	`+ .read()`
	`285`	`+ .epoch_validator_custody_requirements`
	`286`	`+ .iter()`
	`287`	`+ .map(\|(epoch, count)\| (epoch, count))`
	`288`	`+ .collect(),`
`275`	`289`	`}`
`276`	`290`	`}`
`277`	`291`	`}`