Skip to content

Commit 19a721c

Browse files
authored
rid debug peerdas supernode flag (#7810)
1 parent 3c62cdc commit 19a721c

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

beacon_chain/conf.nim

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,6 @@ type
241241
desc: "Subscribe to all subnet topics when gossiping"
242242
name: "subscribe-all-subnets" .}: bool
243243

244-
debugPeerdasSupernode* {.
245-
hidden
246-
defaultValue: false,
247-
name: "debug-peerdas-supernode" .}: bool
248-
249244
peerdasSupernode* {.
250245
defaultValue: false,
251246
desc: "Subscribe to all column subnets, thereby becoming a PeerDAS supernode"

beacon_chain/nimbus_beacon_node.nim

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ proc initFullNode(
418418
payloadAttestationPool = newClone(PayloadAttestationPool.init(dag))
419419
blobQuarantine = newClone(BlobQuarantine.init(
420420
dag.cfg, dag.db.getQuarantineDB(), 10, onBlobSidecarAdded))
421-
supernode = node.config.peerdasSupernode or node.config.debugPeerdasSupernode
421+
supernode = node.config.peerdasSupernode
422422
lightSupernode = node.config.lightSupernode
423423
localCustodyGroups =
424424
if supernode:
@@ -1312,7 +1312,7 @@ func readCustodyGroupSubnets(node: BeaconNode): uint64 =
13121312
let
13131313
custodyGroups = node.dag.cfg.NUMBER_OF_CUSTODY_GROUPS
13141314
vcus_count = node.dataColumnQuarantine.custodyColumns.lenu64
1315-
if node.config.peerdasSupernode or node.config.debugPeerdasSupernode:
1315+
if node.config.peerdasSupernode:
13161316
custodyGroups
13171317
elif node.config.lightSupernode:
13181318
(custodyGroups div 2) + 1
@@ -2048,7 +2048,6 @@ proc onSlotEnd(node: BeaconNode, slot: Slot) {.async.} =
20482048
node.updateSyncCommitteeTopics(slot + 1)
20492049

20502050
if (not node.config.peerdasSupernode) and
2051-
(not node.config.debugPeerdasSupernode) and
20522051
(not node.config.lightSupernode) and
20532052
node.dataColumnQuarantine[].len == 0 and
20542053
node.attachedValidatorBalanceTotal > 0.Gwei:
@@ -2853,11 +2852,10 @@ proc doRunBeaconNode(
28532852
# TODO when reconstruction works again, re-enable
28542853
# this is required because the fall-through is that if one of these is
28552854
# enabled, the (working) light supernode code won't run at all.
2856-
if config.debugPeerdasSuperNode or config.peerdasSuperNode:
2855+
if config.peerdasSuperNode:
28572856
# It's at least not worse than not doing this; a functioning (full)
28582857
# supernode reconstructs and stores a superset of these columns
28592858
config.lightSupernode = true
2860-
config.debugPeerdasSupernode = false
28612859
config.peerdasSupernode = false
28622860

28632861
if config.rpcEnabled.isSome:

0 commit comments

Comments
 (0)