@lodestar/beacon-node 1.36.0-dev.598c1ec54e → 1.36.0-dev.6604fa5719

package/src/network/subnets/util.ts

@@ -1,6 +1,11 @@
 import {digest} from "@chainsafe/as-sha256";
-import {ChainConfig} from "@lodestar/config";
-import {ATTESTATION_SUBNET_COUNT, ATTESTATION_SUBNET_PREFIX_BITS, NODE_ID_BITS} from "@lodestar/params";
+import {
+  ATTESTATION_SUBNET_COUNT,
+  ATTESTATION_SUBNET_PREFIX_BITS,
+  EPOCHS_PER_SUBNET_SUBSCRIPTION,
+  NODE_ID_BITS,
+  SUBNETS_PER_NODE,
+} from "@lodestar/params";
 import {computeShuffledIndex} from "@lodestar/state-transition";
 import {Epoch, ssz} from "@lodestar/types";
 import {NodeId} from "./interface.js";
@@ -8,10 +13,10 @@ import {NodeId} from "./interface.js";
 /**
  * Spec https://github.com/ethereum/consensus-specs/blob/v1.4.0-alpha.3/specs/phase0/p2p-interface.md
  */
-export function computeSubscribedSubnet(config: ChainConfig, nodeId: NodeId, epoch: Epoch): number[] {
+export function computeSubscribedSubnet(nodeId: NodeId, epoch: Epoch): number[] {
   const subnets: number[] = [];
-  for (let index = 0; index < config.SUBNETS_PER_NODE; index++) {
-    subnets.push(computeSubscribedSubnetByIndex(config, nodeId, epoch, index));
+  for (let index = 0; index < SUBNETS_PER_NODE; index++) {
+    subnets.push(computeSubscribedSubnetByIndex(nodeId, epoch, index));
   }
   return subnets;
 }
@@ -19,16 +24,11 @@ export function computeSubscribedSubnet(config: ChainConfig, nodeId: NodeId, epo
 /**
  * Spec https://github.com/ethereum/consensus-specs/blob/v1.4.0-alpha.3/specs/phase0/p2p-interface.md
  */
-export function computeSubscribedSubnetByIndex(
-  config: ChainConfig,
-  nodeId: NodeId,
-  epoch: Epoch,
-  index: number
-): number {
+export function computeSubscribedSubnetByIndex(nodeId: NodeId, epoch: Epoch, index: number): number {
   const nodeIdPrefix = getNodeIdPrefix(nodeId);
   const nodeOffset = getNodeOffset(nodeId);
   const permutationSeed = digest(
-    ssz.UintNum64.serialize(Math.floor((epoch + nodeOffset) / config.EPOCHS_PER_SUBNET_SUBSCRIPTION))
+    ssz.UintNum64.serialize(Math.floor((epoch + nodeOffset) / EPOCHS_PER_SUBNET_SUBSCRIPTION))
   );
   const permutatedPrefix = computeShuffledIndex(nodeIdPrefix, 1 << ATTESTATION_SUBNET_PREFIX_BITS, permutationSeed);
   return (permutatedPrefix + index) % ATTESTATION_SUBNET_COUNT;

package/src/util/clock.ts

@@ -4,6 +4,7 @@ import {ChainForkConfig} from "@lodestar/config";
 import {computeEpochAtSlot, computeTimeAtSlot, getCurrentSlot} from "@lodestar/state-transition";
 import type {Epoch, Slot} from "@lodestar/types";
 import {ErrorAborted} from "@lodestar/utils";
+import {MAXIMUM_GOSSIP_CLOCK_DISPARITY} from "../constants/constants.js";
 
 export enum ClockEvent {
   /**
@@ -100,7 +101,7 @@ export class Clock extends EventEmitter implements IClock {
   get currentSlotWithGossipDisparity(): Slot {
     const currentSlot = this.currentSlot;
     const nextSlotTime = computeTimeAtSlot(this.config, currentSlot + 1, this.genesisTime) * 1000;
-    return nextSlotTime - Date.now() < this.config.MAXIMUM_GOSSIP_CLOCK_DISPARITY ? currentSlot + 1 : currentSlot;
+    return nextSlotTime - Date.now() < MAXIMUM_GOSSIP_CLOCK_DISPARITY ? currentSlot + 1 : currentSlot;
   }
 
   get currentEpoch(): Epoch {
@@ -129,12 +130,12 @@ export class Clock extends EventEmitter implements IClock {
     }
     const nextSlotTime = computeTimeAtSlot(this.config, currentSlot + 1, this.genesisTime) * 1000;
     // we're too close to next slot, accept next slot
-    if (nextSlotTime - Date.now() < this.config.MAXIMUM_GOSSIP_CLOCK_DISPARITY) {
+    if (nextSlotTime - Date.now() < MAXIMUM_GOSSIP_CLOCK_DISPARITY) {
       return slot === currentSlot + 1;
     }
     const currentSlotTime = computeTimeAtSlot(this.config, currentSlot, this.genesisTime) * 1000;
     // we've just passed the current slot, accept previous slot
-    if (Date.now() - currentSlotTime < this.config.MAXIMUM_GOSSIP_CLOCK_DISPARITY) {
+    if (Date.now() - currentSlotTime < MAXIMUM_GOSSIP_CLOCK_DISPARITY) {
       return slot === currentSlot - 1;
     }
     return false;