chore: remove AttnetsService (#6579)

* chore: remove AttnetsService * chore: fix lint * fix: check type in cli * chore: refactor DLLAttnetsService to AttnetsService * Revert "chore: refactor DLLAttnetsService to AttnetsService" This reverts commit 9e0cb99.
ChainSafe · Mar 28, 2024 · d8f6199 · d8f6199
1 parent ea7c6c6
commit d8f6199
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 620 deletions.
diff --git a/docs/pages/beacon-management/networking.md b/docs/pages/beacon-management/networking.md
@@ -14,7 +14,6 @@ Some of the important Lodestar flags related to networking are:
 - [`--port6`](./beacon-cli#--port6)
 - [`--discoveryPort6`](./beacon-cli#--discoveryport6)
 - [`--bootnodes`](./beacon-cli#--bootnodes)
-- [`--deterministicLongLivedAttnets`](./beacon-cli#--deterministiclonglivedattnets)
 - [`--subscribeAllSubnets`](./beacon-cli#--subscribeallsubnets)
 - [`--disablePeerScoring`](./beacon-cli#--disablepeerscoring)
 - [`--enr.ip`](./beacon-cli#--enrip)

diff --git a/packages/beacon-node/src/network/core/metrics.ts b/packages/beacon-node/src/network/core/metrics.ts
@@ -1,7 +1,6 @@
 import {RegistryMetricCreator} from "../../metrics/utils/registryMetricCreator.js";
 import {SubnetType} from "../metadata.js";
 import {DiscoveredPeerStatus} from "../peers/discover.js";
-import {SubnetSource} from "../subnets/attnetsService.js";
 import {DLLSubnetSource} from "../subnets/dllAttnetsService.js";
 
 export type NetworkCoreMetrics = ReturnType<typeof createNetworkCoreMetrics>;
@@ -214,12 +213,12 @@ export function createNetworkCoreMetrics(register: RegistryMetricCreator) {
         name: "lodestar_attnets_service_long_lived_subscriptions_total",
         help: "Count of long lived subscriptions",
       }),
-      subscribeSubnets: register.gauge<{subnet: number; src: SubnetSource | DLLSubnetSource}>({
+      subscribeSubnets: register.gauge<{subnet: number; src: DLLSubnetSource}>({
         name: "lodestar_attnets_service_subscribe_subnets_total",
         help: "Count of subscribe_subnets calls",
         labelNames: ["subnet", "src"],
       }),
-      unsubscribeSubnets: register.gauge<{subnet: number; src: SubnetSource | DLLSubnetSource}>({
+      unsubscribeSubnets: register.gauge<{subnet: number; src: DLLSubnetSource}>({
         name: "lodestar_attnets_service_unsubscribe_subnets_total",
         help: "Count of unsubscribe_subnets calls",
         labelNames: ["subnet", "src"],

diff --git a/packages/beacon-node/src/network/core/networkCore.ts b/packages/beacon-node/src/network/core/networkCore.ts
@@ -16,7 +16,6 @@ import {PeerManager} from "../peers/peerManager.js";
 import {ReqRespBeaconNode} from "../reqresp/ReqRespBeaconNode.js";
 import {OutgoingRequestArgs, GetReqRespHandlerFn} from "../reqresp/types.js";
 import {Eth2Gossipsub, getCoreTopicsAtFork} from "../gossip/index.js";
-import {AttnetsService} from "../subnets/attnetsService.js";
 import {SyncnetsService} from "../subnets/syncnetsService.js";
 import {FORK_EPOCH_LOOKAHEAD, getActiveForks} from "../forks.js";
 import {NetworkOptions} from "../options.js";
@@ -197,9 +196,7 @@ export class NetworkCore implements INetworkCore {
 
     const enr = opts.discv5?.enr;
     const nodeId = enr ? fromHexString(ENR.decodeTxt(enr).nodeId) : null;
-    const attnetsService = opts.deterministicLongLivedAttnets
-      ? new DLLAttnetsService(config, clock, gossip, metadata, logger, metrics, nodeId, opts)
-      : new AttnetsService(config, clock, gossip, metadata, logger, metrics, opts);
+    const attnetsService = new DLLAttnetsService(config, clock, gossip, metadata, logger, metrics, nodeId, opts);
     const syncnetsService = new SyncnetsService(config, clock, gossip, metadata, logger, metrics, opts);
 
     const peerManager = await PeerManager.init(

diff --git a/packages/beacon-node/src/network/options.ts b/packages/beacon-node/src/network/options.ts
@@ -35,8 +35,6 @@ export const defaultNetworkOptions: NetworkOptions = {
   useWorker: true,
   // default set via research in https://github.com/ChainSafe/lodestar/issues/2115
   maxYoungGenerationSizeMb: 152,
-  // subscribe to 2 subnets per node since v1.10
-  deterministicLongLivedAttnets: true,
   // subscribe 2 slots before aggregator dutied slot to get stable mesh peers as monitored on goerli
   slotsToSubscribeBeforeAggregatorDuty: 2,
   // this should only be set to true if useWorker is true