Merge branch 'master' into dapplion/typesafe-types

docker-compose.validator.yml

@@ -4,14 +4,14 @@ services:
     build: .
     image: lodestar
     restart: always
-    depends_on:
-      - beacon_node
     volumes:
       - validator:/data
+      - logs:/logs
       - ./keystores:/keystores
       - ./secrets:/secrets
     env_file: .env
-    command: validator --rootDir /data --keystoresDir /keystores --secretsDir /secrets --server http://beacon_node:9596
+    command: validator --rootDir /data --keystoresDir /keystores --secretsDir /secrets --server http://beacon_node:9596 --logFile /logs/validator.log --logLevelFile debug
 
 volumes:
   validator:
+  logs:

docker-compose.yml

@@ -6,19 +6,18 @@ services:
     restart: always
     volumes:
       - beacon_node:/data
+      - logs:/logs
     env_file: .env
     ports:
       - "9000:9000" # P2P port
       - "9596:9596" # REST API port
-    command: beacon --rootDir /data --api.rest.host 0.0.0.0 --metrics.enabled
+    command: beacon --rootDir /data --api.rest.host 0.0.0.0 --metrics.enabled --logFile /logs/beacon.log --logLevelFile debug
 
   prometheus:
     build: docker/prometheus
     restart: always
     volumes:
       - "prometheus:/prometheus"
-    depends_on:
-      - beacon_node
 
   grafana:
     build: docker/grafana
@@ -27,10 +26,9 @@ services:
       - "3000:3000"
     volumes:
       - "grafana:/var/lib/grafana"
-    depends_on:
-      - prometheus
 
 volumes:
   beacon_node:
+  logs:
   prometheus:
   grafana:

docker/grafana/provisioning/dashboards/lodestar.json

@@ -33,7 +33,12 @@
       "type": "row"
     },
     {
-      "aliasColors": {},
+      "aliasColors": {
+        "(time() - lodestar_genesis_time) / 12": "rgba(48, 208, 255, 0.51)",
+        "clock slot": "rgba(105, 220, 255, 0.53)",
+        "head slot": "green",
+        "process restart": "dark-red"
+      },
       "bars": false,
       "dashLength": 10,
       "dashes": false,
@@ -75,16 +80,37 @@
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "process restart",
+          "yaxis": 2
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
+        {
+          "expr": "(time() - lodestar_genesis_time) / 12",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "legendFormat": "clock slot",
+          "refId": "C"
+        },
         {
           "expr": "beacon_head_slot",
+          "hide": false,
           "interval": "",
-          "legendFormat": "",
+          "legendFormat": "head slot",
           "refId": "A"
+        },
+        {
+          "expr": "changes(process_start_time_seconds[5m])",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "process restart",
+          "refId": "B"
         }
       ],
       "thresholds": [],
@@ -115,11 +141,12 @@
           "show": true
         },
         {
+          "decimals": 0,
           "format": "short",
           "label": null,
           "logBase": 1,
-          "max": null,
-          "min": null,
+          "max": "1",
+          "min": "0.1",
           "show": true
         }
       ],

packages/cli/src/cmds/dev/options.ts

@@ -47,10 +47,10 @@ const devOwnOptions: ICliCommandOptions<IDevOwnArgs> = {
  * Note: use beaconNodeOptions and globalOptions to make sure option key is correct
  */
 const externalOptionsOverrides: {[k: string]: Options} = {
-  "sync.minPeers": {
-    ...beaconNodeOptions["sync.minPeers"],
+  "sync.isSingleNode": {
+    ...beaconNodeOptions["sync.isSingleNode"],
     defaultDescription: undefined,
-    default: 0,
+    default: true,
   },
   "network.maxPeers": {
     ...beaconNodeOptions["network.maxPeers"],

packages/cli/src/options/beaconNodeOptions/sync.ts

@@ -2,20 +2,23 @@ import {defaultOptions, IBeaconNodeOptions} from "@chainsafe/lodestar";
 import {ICliCommandOptions} from "../../util";
 
 export interface ISyncArgs {
-  "sync.minPeers": number;
+  "sync.isSingleNode": boolean;
 }
 
 export function parseArgs(args: ISyncArgs): IBeaconNodeOptions["sync"] {
   return {
-    minPeers: args["sync.minPeers"],
+    isSingleNode: args["sync.isSingleNode"],
   };
 }
 
 export const options: ICliCommandOptions<ISyncArgs> = {
-  "sync.minPeers": {
-    type: "number",
-    description: "Minimum number of peers before the beacon chain starts syncing",
-    defaultDescription: String(defaultOptions.sync.minPeers),
+  "sync.isSingleNode": {
+    hidden: true,
+    type: "boolean",
+    description:
+      "Allow node to consider itself synced without being connected to a peer. \
+Use only for local networks with a single node, can be dangerous in regular networks.",
+    defaultDescription: String(defaultOptions.sync.isSingleNode),
     group: "sync",
   },
 };

packages/cli/test/unit/options/beaconNodeOptions.test.ts

@@ -34,7 +34,7 @@ describe("options / beaconNodeOptions", () => {
       "network.bootMultiaddrs": [],
       "network.localMultiaddrs": [],
 
-      "sync.minPeers": 17,
+      "sync.isSingleNode": true,
     } as IBeaconNodeArgs;
 
     const expectedOptions: RecursivePartial<IBeaconNodeOptions> = {
@@ -76,7 +76,7 @@ describe("options / beaconNodeOptions", () => {
         localMultiaddrs: [],
       },
       sync: {
-        minPeers: 17,
+        isSingleNode: true,
       },
     };
 

packages/lodestar/src/api/impl/lodestar/index.ts

@@ -1,22 +1,26 @@
 import {IBeaconConfig} from "@chainsafe/lodestar-config";
 import {Epoch} from "@chainsafe/lodestar-types";
-import {IApiModules} from "..";
+import {IApiModules} from "../interface";
 import {getLatestWeakSubjectivityCheckpointEpoch} from "../../../../../beacon-state-transition/lib/fast/util/weakSubjectivity";
 import {IBeaconChain} from "../../../chain";
+import {IBeaconSync} from "../../../sync";
+import {SyncChainDebugState} from "../../../sync/range/chain";
 
-/* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
 export interface ILodestarApi {
   getWtfNode(): string;
   getLatestWeakSubjectivityCheckpointEpoch(): Promise<Epoch>;
+  getSyncChainsDebugState(): SyncChainDebugState[];
 }
 
 export class LodestarApi implements ILodestarApi {
   private readonly config: IBeaconConfig;
   private readonly chain: IBeaconChain;
+  private readonly sync: IBeaconSync;
 
-  constructor(modules: Pick<IApiModules, "config" | "chain">) {
+  constructor(modules: Pick<IApiModules, "config" | "chain" | "sync">) {
     this.config = modules.config;
     this.chain = modules.chain;
+    this.sync = modules.sync;
 
     // Allows to load wtfnode listeners immedeatelly. Usefull when dockerized,
     // so after an unexpected restart wtfnode becomes properly loaded again
@@ -41,6 +45,7 @@ export class LodestarApi implements ILodestarApi {
     function logger(...args: string[]): void {
       for (const arg of args) logs.push(arg);
     }
+    /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
     wtfnode.setLogger("info", logger);
     wtfnode.setLogger("warn", logger);
     wtfnode.setLogger("error", logger);
@@ -52,4 +57,8 @@ export class LodestarApi implements ILodestarApi {
     const state = this.chain.getHeadState();
     return getLatestWeakSubjectivityCheckpointEpoch(this.config, state);
   }
+
+  getSyncChainsDebugState(): SyncChainDebugState[] {
+    return this.sync.getSyncChainsDebugState();
+  }
 }

packages/lodestar/src/api/impl/validator/validator.ts

@@ -6,7 +6,6 @@ import bls, {Signature} from "@chainsafe/bls";
 import {
   CachedBeaconState,
   computeStartSlotAtEpoch,
-  computeSubnetForCommitteesAtSlot,
   proposerShufflingDecisionRoot,
   attesterShufflingDecisionRoot,
 } from "@chainsafe/lodestar-beacon-state-transition";
@@ -25,7 +24,7 @@ import {ZERO_HASH} from "../../../constants";
 import {IBeaconDb} from "../../../db";
 import {IEth1ForBlockProduction} from "../../../eth1";
 import {INetwork} from "../../../network";
-import {IBeaconSync, SyncMode} from "../../../sync";
+import {IBeaconSync, SyncState} from "../../../sync";
 import {toGraffitiBuffer} from "../../../util/graffiti";
 import {IApiOptions} from "../../options";
 import {ApiError} from "../errors";
@@ -255,27 +254,7 @@ export class ValidatorApi implements IValidatorApi {
   async prepareBeaconCommitteeSubnet(subscriptions: phase0.BeaconCommitteeSubscription[]): Promise<void> {
     this.notWhileSyncing();
 
-    // Determine if the validator is an aggregator. If so, we subscribe to the subnet and
-    // if successful add the validator to a mapping of known aggregators for that exact
-    // subnet.
-    for (const {isAggregator, slot, committeeIndex} of subscriptions) {
-      if (isAggregator) {
-        this.sync.collectAttestations(slot, committeeIndex);
-      }
-    }
-
-    this.network.requestAttSubnets(
-      subscriptions.map(({slot, committeesAtSlot, committeeIndex}) => ({
-        subnetId: computeSubnetForCommitteesAtSlot(this.config, slot, committeesAtSlot, committeeIndex),
-        // Network should keep finding peers for this subnet until `toSlot`
-        // add one slot to ensure we keep the peer for the subscription slot
-        toSlot: slot + 1,
-      }))
-    );
-
-    // TODO:
-    // Update the `known_validators` mapping and subscribes to a set of random subnets if required
-    // It must also update the ENR to indicate our long-lived subscription to the subnet
+    this.network.prepareBeaconCommitteeSubnet(subscriptions);
 
     // TODO:
     // If the discovery mechanism isn't disabled, attempt to set up a peer discovery for the
@@ -338,8 +317,8 @@ export class ValidatorApi implements IValidatorApi {
 
     const syncState = this.sync.state;
     switch (syncState) {
-      case SyncMode.INITIAL_SYNCING:
-      case SyncMode.REGULAR_SYNCING: {
+      case SyncState.SyncingFinalized:
+      case SyncState.SyncingHead: {
         const currentSlot = this.chain.clock.currentSlot;
         const headSlot = this.chain.forkChoice.getHead().slot;
         if (currentSlot - headSlot > SYNC_TOLERANCE_EPOCHS * this.config.params.SLOTS_PER_EPOCH) {
@@ -349,14 +328,11 @@ export class ValidatorApi implements IValidatorApi {
         }
       }
 
-      case SyncMode.SYNCED:
+      case SyncState.Synced:
         return;
 
-      case SyncMode.WAITING_PEERS:
+      case SyncState.Stalled:
         throw new ApiError(503, "Node is waiting for peers");
-
-      case SyncMode.STOPPED:
-        throw new ApiError(503, "Node is stopped");
     }
   }
 }

packages/lodestar/src/api/rest/interface.ts

@@ -23,5 +23,5 @@ export interface IRestApiModules {
   config: IBeaconConfig;
   logger: ILogger;
   api: IApi;
-  metrics?: IMetrics;
+  metrics: IMetrics | null;
 }

packages/lodestar/src/chain/blocks/processor.ts

@@ -23,7 +23,7 @@ type BlockProcessorModules = {
   regen: IStateRegenerator;
   emitter: ChainEventEmitter;
   bls: IBlsVerifier;
-  metrics?: IMetrics;
+  metrics: IMetrics | null;
   clock: IBeaconClock;
   checkpointStateCache: CheckpointStateCache;
 };
@@ -46,12 +46,14 @@ export class BlockProcessor {
     this.modules = modules;
     this.jobQueue = new JobQueue(
       {maxLength, signal},
-      modules.metrics && {
-        length: modules.metrics.blockProcessorQueueLength,
-        droppedJobs: modules.metrics.blockProcessorQueueDroppedJobs,
-        jobTime: modules.metrics.blockProcessorQueueJobTime,
-        jobWaitTime: modules.metrics.blockProcessorQueueJobWaitTime,
-      }
+      modules.metrics
+        ? {
+            length: modules.metrics.blockProcessorQueueLength,
+            droppedJobs: modules.metrics.blockProcessorQueueDroppedJobs,
+            jobTime: modules.metrics.blockProcessorQueueJobTime,
+            jobWaitTime: modules.metrics.blockProcessorQueueJobWaitTime,
+          }
+        : undefined
     );
   }
 

packages/lodestar/src/chain/bls/multithread/index.ts

@@ -15,7 +15,7 @@ import {IMetrics} from "../../../metrics";
 
 export type BlsMultiThreadWorkerPoolModules = {
   logger: ILogger;
-  metrics?: IMetrics;
+  metrics: IMetrics | null;
   signal: AbortSignal;
 };
 
@@ -69,7 +69,7 @@ type WorkerDescriptor = {
  */
 export class BlsMultiThreadWorkerPool {
   private readonly logger: ILogger;
-  private readonly metrics?: IMetrics;
+  private readonly metrics: IMetrics | null;
   private readonly signal: AbortSignal;
 
   private readonly format: PointFormat;