From 4640cef86002a8ea88c4ba24bf0d5eeadaa94d49 Mon Sep 17 00:00:00 2001 From: Agnish Ghosh Date: Wed, 17 Dec 2025 18:27:40 +0530 Subject: [PATCH] rid debug peerdas supernode flag --- beacon_chain/conf.nim | 5 ----- beacon_chain/nimbus_beacon_node.nim | 8 +++----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/beacon_chain/conf.nim b/beacon_chain/conf.nim index ad052a1335..592a7b8333 100644 --- a/beacon_chain/conf.nim +++ b/beacon_chain/conf.nim @@ -241,11 +241,6 @@ type desc: "Subscribe to all subnet topics when gossiping" name: "subscribe-all-subnets" .}: bool - debugPeerdasSupernode* {. - hidden - defaultValue: false, - name: "debug-peerdas-supernode" .}: bool - peerdasSupernode* {. defaultValue: false, desc: "Subscribe to all column subnets, thereby becoming a PeerDAS supernode" diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim index ad49648b5a..c0e9cdfbcf 100644 --- a/beacon_chain/nimbus_beacon_node.nim +++ b/beacon_chain/nimbus_beacon_node.nim @@ -418,7 +418,7 @@ proc initFullNode( payloadAttestationPool = newClone(PayloadAttestationPool.init(dag)) blobQuarantine = newClone(BlobQuarantine.init( dag.cfg, dag.db.getQuarantineDB(), 10, onBlobSidecarAdded)) - supernode = node.config.peerdasSupernode or node.config.debugPeerdasSupernode + supernode = node.config.peerdasSupernode lightSupernode = node.config.lightSupernode localCustodyGroups = if supernode: @@ -1312,7 +1312,7 @@ func readCustodyGroupSubnets(node: BeaconNode): uint64 = let custodyGroups = node.dag.cfg.NUMBER_OF_CUSTODY_GROUPS vcus_count = node.dataColumnQuarantine.custodyColumns.lenu64 - if node.config.peerdasSupernode or node.config.debugPeerdasSupernode: + if node.config.peerdasSupernode: custodyGroups elif node.config.lightSupernode: (custodyGroups div 2) + 1 @@ -2048,7 +2048,6 @@ proc onSlotEnd(node: BeaconNode, slot: Slot) {.async.} = node.updateSyncCommitteeTopics(slot + 1) if (not node.config.peerdasSupernode) and - (not node.config.debugPeerdasSupernode) and (not node.config.lightSupernode) and node.dataColumnQuarantine[].len == 0 and node.attachedValidatorBalanceTotal > 0.Gwei: @@ -2853,11 +2852,10 @@ proc doRunBeaconNode( # TODO when reconstruction works again, re-enable # this is required because the fall-through is that if one of these is # enabled, the (working) light supernode code won't run at all. - if config.debugPeerdasSuperNode or config.peerdasSuperNode: + if config.peerdasSuperNode: # It's at least not worse than not doing this; a functioning (full) # supernode reconstructs and stores a superset of these columns config.lightSupernode = true - config.debugPeerdasSupernode = false config.peerdasSupernode = false if config.rpcEnabled.isSome: