Address review comments.

Author: agnxsh

beacon_chain/spec/peerdas_helpers.nim

@@ -486,15 +486,11 @@ proc verify_data_column_sidecar_kzg_proofs*(sidecar: DataColumnSidecar):
 
   ok()
 
-# https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.3/specs/fulu/das-core.md#validator-custody
-proc get_validators_custody_requirement*(cfg: RuntimeConfig,
+# https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.5/specs/fulu/validator.md#validator-custody
+func get_validators_custody_requirement*(cfg: RuntimeConfig,
                                          hstate: ForkyHashedBeaconState,
-                                         validator_indices: openArray[ValidatorIndex]):
+                                         total_node_balance: Gwei):
                                          uint64 =
-  let state = hstate.data
-  var total_node_balance: Gwei
-  for index in validator_indices:
-    total_node_balance += state.balances[index]
   let count = total_node_balance div BALANCE_PER_ADDITIONAL_CUSTODY_GROUP
   min(max(count.uint64, cfg.VALIDATOR_CUSTODY_REQUIREMENT),
       cfg.NUMBER_OF_CUSTODY_GROUPS.uint64)

beacon_chain/sync/validator_custody.nim

@@ -8,17 +8,18 @@
 {.push raises: [].}
 
 import chronos, chronicles
-import ssz_serialization/types
+import ssz_serialization/[proofs, types]
 import
   ../validators/action_tracker,
-  ../spec/[forks, network, helpers, peerdas_helpers],
+  ../spec/[beaconstate, forks, network, helpers, peerdas_helpers],
   ../networking/eth2_network,
   ../consensus_object_pools/blockchain_dag,
   ../consensus_object_pools/block_dag,
   ../consensus_object_pools/data_column_quarantine,
-  "."/[request_manager,  sync_manager, sync_protocol]
+  "."/[request_manager, sync_manager, sync_protocol]
 
-from std/algorithm import binarySearch, sort
+from std/algorithm import sort
+from std/sequtils import toSeq
 from ../beacon_clock import GetBeaconTimeFn
 
 logScope: topics = "validator_custody"
@@ -65,17 +66,15 @@ proc init*(T: type ValidatorCustodyRef, network: Eth2Node,
     dataColumnQuarantine: dataColumnQuarantine)
 
 proc detectNewValidatorCustody(vcus: ValidatorCustodyRef): seq[ColumnIndex] =
-  let
-    headState =  vcus.dag.headState
   var
-    res: seq[ColumnIndex]
+    cache = StateCache()
     diff_set: HashSet[ColumnIndex]
-  withState(headState):
+  withState(vcus.dag.headState):
     when consensusFork >= ConsensusFork.Fulu:
-      var validator_indices =
-        get_active_validator_indices(forkyState.data, vcus.network.getBeaconTime().slotOrZero.epoch)
+      let total_node_balance =
+        get_total_active_balance(forkyState.data, cache)
       let vcustody =
-        vcus.dag.cfg.get_validators_custody_requirement(forkyState, validator_indices)
+        vcus.dag.cfg.get_validators_custody_requirement(forkyState, total_node_balance)
 
       let
         newer_columns =
@@ -94,10 +93,7 @@ proc detectNewValidatorCustody(vcus: ValidatorCustodyRef): seq[ColumnIndex] =
         diff_set = newer_column_set.difference(vcus.older_column_set)
       vcus.newer_column_set = newer_column_set
 
-  for i in diff_set.items():
-    res.add(i)
-
-  res
+  toSeq(diff_set)
 
 proc makeRefillList(vcus: ValidatorCustodyRef, diff: seq[ColumnIndex]) =
   let