Refactor validator client

packages/beacon-state-transition/src/fast/util/epochContext.ts

@@ -2,7 +2,7 @@ import {ByteVector, hash, toHexString, BitList, List, readonlyValues} from "@cha
 import bls, {CoordType, PublicKey} from "@chainsafe/bls";
 import {BLSSignature, CommitteeIndex, Epoch, Slot, ValidatorIndex, phase0, allForks} from "@chainsafe/lodestar-types";
 import {IBeaconConfig} from "@chainsafe/lodestar-config";
-import {intToBytes, assert} from "@chainsafe/lodestar-utils";
+import {intToBytes} from "@chainsafe/lodestar-utils";
 
 import {GENESIS_EPOCH} from "../../constants";
 import {
@@ -206,7 +206,7 @@ export class EpochContext {
   getBeaconCommittee(slot: Slot, index: CommitteeIndex): ValidatorIndex[] {
     const slotCommittees = this._getSlotCommittees(slot);
     if (index >= slotCommittees.length) {
-      throw new Error(`crosslink committee retrieval: out of range committee index: ${index}`);
+      throw new Error(`Requesting beacon committee index ${index} over slot committees len ${slotCommittees.length}`);
     }
     return slotCommittees[index];
   }
@@ -218,7 +218,9 @@ export class EpochContext {
   getBeaconProposer(slot: Slot): ValidatorIndex {
     const epoch = computeEpochAtSlot(this.config, slot);
     if (epoch !== this.currentShuffling.epoch) {
-      throw new Error("beacon proposer index out of range");
+      throw new Error(
+        `Requesting beacon proposer for different epoch current shuffling: ${epoch} != ${this.currentShuffling.epoch}`
+      );
     }
     return this.proposers[slot % this.config.params.SLOTS_PER_EPOCH];
   }
@@ -260,8 +262,11 @@ export class EpochContext {
    * Return null if no assignment..
    */
   getCommitteeAssignment(epoch: Epoch, validatorIndex: ValidatorIndex): phase0.CommitteeAssignment | null {
-    const nextEpoch = this.currentShuffling.epoch + 1;
-    assert.lte(epoch, nextEpoch, "Cannot get committee assignment for epoch more than 1 ahead");
+    if (epoch > this.currentShuffling.epoch + 1) {
+      throw Error(
+        `Requesting committee assignment for more than 1 epoch ahead: ${epoch} > ${this.currentShuffling.epoch} + 1`
+      );
+    }
 
     const epochStartSlot = computeStartSlotAtEpoch(this.config, epoch);
     for (let slot = epochStartSlot; slot < epochStartSlot + this.config.params.SLOTS_PER_EPOCH; slot++) {
@@ -301,7 +306,7 @@ export class EpochContext {
     } else if (epoch === this.nextShuffling.epoch) {
       return this.nextShuffling.committees[epochSlot];
     } else {
-      throw new Error(`crosslink committee retrieval: out of range epoch: ${epoch}`);
+      throw new Error(`Requesting slot committee out of range epoch: ${epoch} current: ${this.currentShuffling.epoch}`);
     }
   }
 }

packages/cli/src/cmds/account/cmds/validator/slashingProtection/utils.ts

@@ -1,7 +1,6 @@
 import {Root} from "@chainsafe/lodestar-types";
-import {SlashingProtection} from "@chainsafe/lodestar-validator";
+import {ApiClientOverRest, SlashingProtection} from "@chainsafe/lodestar-validator";
 import {LevelDbController} from "@chainsafe/lodestar-db";
-import {ApiClientProvider} from "@chainsafe/lodestar-validator";
 import {YargsError} from "../../../../../util";
 import {IGlobalArgs} from "../../../../../options";
 import {getValidatorPaths} from "../../../../validator/paths";
@@ -30,8 +29,7 @@ export async function getGenesisValidatorsRoot(args: IGlobalArgs & ISlashingProt
   const server = args.server;
 
   const config = getBeaconConfigFromArgs(args);
-  const logger = errorLogger();
-  const api = new ApiClientProvider(config, logger, server);
+  const api = ApiClientOverRest(config, server);
   const genesis = await api.beacon.getGenesis();
 
   if (genesis) {

packages/cli/src/cmds/account/cmds/validator/voluntaryExit.ts

@@ -102,7 +102,7 @@ BE UNTIL AT LEAST TWO YEARS AFTER THE PHASE 0 MAINNET LAUNCH.
 
     const config = getBeaconConfigFromArgs(args);
 
-    const validatorClient = new Validator({
+    const validatorClient = await Validator.initializeFromBeaconNode({
       slashingProtection: getSlashingProtection(args),
       config,
       api: args.server,

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

@@ -2,6 +2,7 @@ import fs from "fs";
 import {promisify} from "util";
 import rimraf from "rimraf";
 import path from "path";
+import {AbortController} from "abort-controller";
 import {GENESIS_SLOT} from "@chainsafe/lodestar-params";
 import {BeaconNode, BeaconDb, initStateFromAnchorState, createNodeJsLibp2p, nodeUtils} from "@chainsafe/lodestar";
 import {IApiClient, SlashingProtection, Validator} from "@chainsafe/lodestar-validator";
@@ -109,7 +110,11 @@ export async function devHandler(args: IDevArgs & IGlobalArgs): Promise<void> {
       controller: new LevelDbController({name: dbPath}, {logger}),
     });
 
-    const validator = new Validator({config, slashingProtection, api, logger, secretKeys});
+    const controller = new AbortController();
+    onGracefulShutdownCbs.push(async () => controller.abort());
+
+    // Initailize genesis once for all validators
+    const validator = await Validator.initializeFromBeaconNode({config, slashingProtection, api, logger, secretKeys});
 
     onGracefulShutdownCbs.push(() => validator.stop());
     await validator.start();

packages/cli/src/cmds/validator/handler.ts

@@ -1,3 +1,5 @@
+import {AbortController} from "abort-controller";
+import {ApiClientOverRest} from "@chainsafe/lodestar-validator";
 import {Validator, SlashingProtection} from "@chainsafe/lodestar-validator";
 import {LevelDbController} from "@chainsafe/lodestar-db";
 import {getBeaconConfigFromArgs} from "../../config";
@@ -33,21 +35,25 @@ export async function validatorHandler(args: IValidatorCliArgs & IGlobalArgs): P
   const dbPath = validatorPaths.validatorsDbDir;
   mkdir(dbPath);
 
-  const validator = new Validator({
-    config,
-    slashingProtection: new SlashingProtection({
-      config: config,
-      controller: new LevelDbController({name: dbPath}, {logger}),
-    }),
-    api: args.server,
-    logger,
-    secretKeys,
-    graffiti,
-  });
-
+  const onGracefulShutdownCbs: (() => Promise<void>)[] = [];
   onGracefulShutdown(async () => {
-    await validator.stop();
+    for (const cb of onGracefulShutdownCbs) await cb();
   }, logger.info.bind(logger));
 
+  // This AbortController interrupts the sleep() calls when waiting for genesis
+  const controller = new AbortController();
+  onGracefulShutdownCbs.push(async () => controller.abort());
+
+  const api = ApiClientOverRest(config, args.server);
+  const slashingProtection = new SlashingProtection({
+    config: config,
+    controller: new LevelDbController({name: dbPath}, {logger}),
+  });
+  const validator = await Validator.initializeFromBeaconNode(
+    {config, slashingProtection, api, logger, secretKeys, graffiti},
+    controller.signal
+  );
+
+  onGracefulShutdownCbs.push(async () => await validator.stop());
   await validator.start();
 }

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

@@ -8,7 +8,6 @@ import {IApiModules} from "../../interface";
 import {BlockId, IBeaconBlocksApi} from "./interface";
 import {resolveBlockId, toBeaconHeaderResponse} from "./utils";
 import {IBeaconSync} from "../../../../sync";
-import {checkSyncStatus} from "../../utils";
 import {INetwork} from "../../../../network/interface";
 
 export * from "./interface";
@@ -109,7 +108,6 @@ export class BeaconBlockApi implements IBeaconBlocksApi {
   }
 
   async publishBlock(signedBlock: phase0.SignedBeaconBlock): Promise<void> {
-    await checkSyncStatus(this.config, this.sync);
     await Promise.all([this.chain.receiveBlock(signedBlock), this.network.gossip.publishBeaconBlock(signedBlock)]);
   }
 }

packages/lodestar/src/api/impl/beacon/pool/pool.ts

@@ -10,7 +10,6 @@ import {INetwork} from "../../../../network";
 import {IBeaconSync} from "../../../../sync";
 import {IApiOptions} from "../../../options";
 import {IApiModules} from "../../interface";
-import {checkSyncStatus} from "../../utils";
 import {IAttestationFilters, IBeaconPoolApi} from "./interface";
 import {phase0} from "@chainsafe/lodestar-types";
 import {fast} from "@chainsafe/lodestar-beacon-state-transition";
@@ -43,7 +42,6 @@ export class BeaconPoolApi implements IBeaconPoolApi {
   }
 
   async submitAttestations(attestations: phase0.Attestation[]): Promise<void> {
-    await checkSyncStatus(this.config, this.sync);
     for (const attestation of attestations) {
       const attestationJob = {
         attestation,

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

@@ -1,30 +1,7 @@
-import {IBeaconConfig} from "@chainsafe/lodestar-config";
 import {allForks} from "@chainsafe/lodestar-types";
 import {ValidatorIndex} from "@chainsafe/lodestar-types/phase0";
 import {ByteVector} from "@chainsafe/ssz";
 import {IBeaconChain} from "../../chain/interface";
-import {IBeaconSync} from "../../sync";
-import {ApiError} from "./errors";
-
-/**
- * Check the sync status of the beacon chain.
- */
-export async function checkSyncStatus(config: IBeaconConfig, sync: IBeaconSync): Promise<void> {
-  if (!sync.isSynced()) {
-    let syncStatus;
-    try {
-      syncStatus = sync.getSyncStatus();
-    } catch (e) {
-      throw new ApiError(503, "Node is stopped");
-    }
-    if (syncStatus.syncDistance > config.params.SLOTS_PER_EPOCH) {
-      throw new ApiError(
-        503,
-        `Node is syncing, status: ${JSON.stringify(config.types.phase0.SyncingStatus.toJson(syncStatus))}`
-      );
-    }
-  }
-}
 
 export function getStateValidatorIndex(
   id: number | ByteVector,