From 49056c3e39768a43fe2a380c5c76488c63bf6cf5 Mon Sep 17 00:00:00 2001
From: tersec <tersec@users.noreply.github.com>
Date: Fri, 7 Jul 2023 04:16:12 +0000
Subject: [PATCH] use v1.3.0 stability subnet behavior when appropriate (#5156)

---
 beacon_chain/networking/eth2_network.nim   |  2 +-
 beacon_chain/nimbus_beacon_node.nim        |  2 +-
 beacon_chain/validators/action_tracker.nim | 17 +++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/beacon_chain/networking/eth2_network.nim b/beacon_chain/networking/eth2_network.nim
index 86effcb60..01249429e 100644
--- a/beacon_chain/networking/eth2_network.nim
+++ b/beacon_chain/networking/eth2_network.nim
@@ -2554,7 +2554,7 @@ proc updateStabilitySubnetMetadata*(node: Eth2Node, attnets: AttnetBits) =
   node.metadata.seq_number += 1
   node.metadata.attnets = attnets
 
-  # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/phase0/validator.md#phase-0-attestation-subnet-stability
+  # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.0/specs/phase0/p2p-interface.md#attestation-subnet-subscription
   # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/phase0/p2p-interface.md#attestation-subnet-bitfield
   let res = node.discovery.updateRecord({
     enrAttestationSubnetsField: SSZ.encode(node.metadata.attnets)
diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index c3d6e32a7..07ed97a8d 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -771,7 +771,7 @@ func forkDigests(node: BeaconNode): auto =
     node.dag.forkDigests.deneb]
   forkDigestsArray
 
-# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/phase0/validator.md#phase-0-attestation-subnet-stability
+# https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.0/specs/phase0/p2p-interface.md#attestation-subnet-subscription
 proc updateAttestationSubnetHandlers(node: BeaconNode, slot: Slot) =
   if node.gossipState.card == 0:
     # When disconnected, updateGossipState is responsible for all things
diff --git a/beacon_chain/validators/action_tracker.nim b/beacon_chain/validators/action_tracker.nim
index 3bb6f55c2..d502ecf04 100644
--- a/beacon_chain/validators/action_tracker.nim
+++ b/beacon_chain/validators/action_tracker.nim
@@ -81,7 +81,6 @@ type
 func hash*(x: AggregatorDuty): Hash =
   hashAllFields(x)
 
-# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/phase0/validator.md#phase-0-attestation-subnet-stability
 func randomStabilitySubnet(
     self: ActionTracker, epoch: Epoch): tuple[subnet_id: SubnetId, expiration: Epoch] =
   (
@@ -130,11 +129,6 @@ proc hasSyncDuty*(
     tracker: ActionTracker, pubkey: ValidatorPubKey, epoch: Epoch): bool =
   epoch < tracker.syncDuties.getOrDefault(pubkey, GENESIS_EPOCH)
 
-const allSubnetBits = block:
-  var res: AttnetBits
-  for i in 0..<res.len: res[i] = true
-  res
-
 func aggregateSubnets*(tracker: ActionTracker, wallSlot: Slot): AttnetBits =
   var res: AttnetBits
   # Subscribe to subnets for upcoming duties
@@ -145,12 +139,20 @@ func aggregateSubnets*(tracker: ActionTracker, wallSlot: Slot): AttnetBits =
       res[duty.subnet_id.int] = true
   res
 
+# TODO https://github.com/nim-lang/Nim/issues/22215 keeps from stabilitySubnets
+const allSubnetBits = block:
+  var res: AttnetBits
+  for i in 0..<res.len: res[i] = true
+  res
+
 func stabilitySubnets*(tracker: ActionTracker, slot: Slot): AttnetBits =
   if tracker.subscribeAllAttnets:
     allSubnetBits
   else:
     var res: AttnetBits
-    if tracker.useOldStabilitySubnets:
+
+    if  tracker.useOldStabilitySubnets or
+        tracker.stabilitySubnets.len < SUBNETS_PER_NODE.int:
       for v in tracker.stabilitySubnets:
         res[v.subnet_id.int] = true
     else:
@@ -180,7 +182,6 @@ proc updateSlot*(tracker: var ActionTracker, wallSlot: Slot) =
     debug "Validator no longer active", index = k
     tracker.knownValidators.del k
 
-  # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/phase0/validator.md#phase-0-attestation-subnet-stability
   let expectedSubnets =
     min(ATTESTATION_SUBNET_COUNT.int, tracker.knownValidators.len)