Fix remote signing

packages/beacon-node/test/unit/network/fork.test.ts

@@ -18,20 +18,23 @@ function getForkConfig({
       seq: ForkSeq.phase0,
       epoch: phase0,
       version: Buffer.from([0, 0, 0, 0]),
+      prevVersion: Buffer.from([0, 0, 0, 0]),
       prevForkName: ForkName.phase0,
     },
     altair: {
       name: ForkName.altair,
       seq: ForkSeq.altair,
       epoch: altair,
       version: Buffer.from([0, 0, 0, 1]),
+      prevVersion: Buffer.from([0, 0, 0, 0]),
       prevForkName: ForkName.phase0,
     },
     bellatrix: {
       name: ForkName.bellatrix,
       seq: ForkSeq.bellatrix,
       epoch: bellatrix,
       version: Buffer.from([0, 0, 0, 2]),
+      prevVersion: Buffer.from([0, 0, 0, 1]),
       prevForkName: ForkName.altair,
     },
   };

packages/cli/src/cmds/validator/signers/index.ts

@@ -39,7 +39,12 @@ export async function getSignersFromArgs(args: IValidatorCliArgs & IGlobalArgs,
   // ONLY USE FOR TESTNETS - Derive interop keys
   if (args.interopIndexes) {
     const indexes = parseRange(args.interopIndexes);
-    return indexes.map((index) => ({type: SignerType.Local, secretKey: interopSecretKey(index)}));
+    // Using a remote signer with TESTNETS
+    if (args["externalSigner.pubkeys"] || args["externalSigner.fetch"]) {
+      return getRemoteSigners(args);
+    } else {
+      return indexes.map((index) => ({type: SignerType.Local, secretKey: interopSecretKey(index)}));
+    }
   }
 
   // UNSAFE, ONLY USE FOR TESTNETS - Derive keys directly from a mnemonic
@@ -71,21 +76,7 @@ export async function getSignersFromArgs(args: IValidatorCliArgs & IGlobalArgs,
 
   // Remote keys declared manually with --externalSignerPublicKeys
   else if (args["externalSigner.pubkeys"] || args["externalSigner.fetch"]) {
-    const externalSignerUrl = args["externalSigner.url"];
-    if (!externalSignerUrl) {
-      throw new YargsError("Must set externalSignerUrl with externalSignerPublicKeys");
-    }
-    if (!isValidHttpUrl(externalSignerUrl)) {
-      throw new YargsError(`Invalid external signer URL ${externalSignerUrl}`);
-    }
-    if (args["externalSigner.pubkeys"] && args["externalSigner.pubkeys"].length === 0) {
-      throw new YargsError("externalSignerPublicKeys is set to an empty list");
-    }
-
-    const pubkeys = args["externalSigner.pubkeys"] ?? (await externalSignerGetKeys(externalSignerUrl));
-    assertValidPubkeysHex(pubkeys);
-
-    return pubkeys.map((pubkey) => ({type: SignerType.Remote, pubkey, url: externalSignerUrl}));
+    return getRemoteSigners(args);
   }
 
   // Read keys from local account manager
@@ -114,3 +105,21 @@ export function getSignerPubkeyHex(signer: Signer): string {
       return signer.pubkey;
   }
 }
+
+async function getRemoteSigners(args: IValidatorCliArgs & IGlobalArgs): Promise<Signer[]> {
+  const externalSignerUrl = args["externalSigner.url"];
+  if (!externalSignerUrl) {
+    throw new YargsError("Must set externalSignerUrl with externalSignerPublicKeys");
+  }
+  if (!isValidHttpUrl(externalSignerUrl)) {
+    throw new YargsError(`Invalid external signer URL ${externalSignerUrl}`);
+  }
+  if (args["externalSigner.pubkeys"] && args["externalSigner.pubkeys"].length === 0) {
+    throw new YargsError("externalSignerPublicKeys is set to an empty list");
+  }
+
+  const pubkeys = args["externalSigner.pubkeys"] ?? (await externalSignerGetKeys(externalSignerUrl));
+  assertValidPubkeysHex(pubkeys);
+
+  return pubkeys.map((pubkey) => ({type: SignerType.Remote, pubkey, url: externalSignerUrl}));
+}

packages/config/src/forkConfig/index.ts

@@ -12,20 +12,23 @@ export function createIForkConfig(config: IChainConfig): IForkConfig {
     epoch: GENESIS_EPOCH,
     version: config.GENESIS_FORK_VERSION,
     // Will never be used
+    prevVersion: config.GENESIS_FORK_VERSION,
     prevForkName: ForkName.phase0,
   };
   const altair = {
     name: ForkName.altair,
     seq: ForkSeq.altair,
     epoch: config.ALTAIR_FORK_EPOCH,
     version: config.ALTAIR_FORK_VERSION,
+    prevVersion: phase0.version,
     prevForkName: ForkName.phase0,
   };
   const bellatrix = {
     name: ForkName.bellatrix,
     seq: ForkSeq.bellatrix,
     epoch: config.BELLATRIX_FORK_EPOCH,
     version: config.BELLATRIX_FORK_VERSION,
+    prevVersion: altair.prevVersion,
     prevForkName: ForkName.altair,
   };
 

packages/config/src/forkConfig/types.ts

@@ -7,6 +7,7 @@ export interface IForkInfo {
   seq: ForkSeq;
   epoch: Epoch;
   version: Version;
+  prevVersion: Version;
   prevForkName: ForkName;
 }
 

packages/config/src/genesisConfig/index.ts

@@ -22,6 +22,8 @@ export function createICachedGenesis(chainForkConfig: IChainForkConfig, genesisV
   }
 
   return {
+    genesisValidatorsRoot,
+
     getDomain(stateSlot: Slot, domainType: DomainType, messageSlot?: Slot): Uint8Array {
       // ```py
       // def get_domain(state: BeaconState, domain_type: DomainType, epoch: Epoch=None) -> Domain:

packages/config/src/genesisConfig/types.ts

@@ -1,5 +1,5 @@
 import {ForkName} from "@lodestar/params";
-import {DomainType, ForkDigest, Slot} from "@lodestar/types";
+import {DomainType, ForkDigest, Root, Slot} from "@lodestar/types";
 
 export type ForkDigestHex = string;
 
@@ -17,4 +17,6 @@ export interface ICachedGenesis extends IForkDigestContext {
    * Note: The configured fork schedule is always used rather than on-chain fork schedule.
    */
   getDomain(stateSlot: Slot, domainType: DomainType, messageSlot?: Slot): Uint8Array;
+
+  readonly genesisValidatorsRoot: Root;
 }

packages/validator/package.json

@@ -31,7 +31,9 @@
     "pretest": "yarn run check-types",
     "test:unit": "nyc --cache-dir .nyc_output/.cache -e .ts mocha 'test/unit/**/*.test.ts'",
     "test": "yarn test:unit",
-    "test:e2e": "yarn run download-spec-tests && mocha 'test/spec/**/*.test.ts'",
+    "test:e2e:only": "mocha 'test/e2e/**/*.test.ts'",
+    "test:spec": "mocha 'test/spec/**/*.test.ts'",
+    "test:e2e": "yarn run download-spec-tests && yarn test:spec && yarn test:e2e:only",
     "download-spec-tests": "node --loader=ts-node/esm test/spec/downloadTests.ts",
     "coverage": "codecov -F lodestar-validator",
     "check-readme": "typescript-docs-verifier"
@@ -61,6 +63,7 @@
     "strict-event-emitter-types": "^2.0.0"
   },
   "devDependencies": {
-    "bigint-buffer": "^1.1.5"
+    "bigint-buffer": "^1.1.5",
+    "testcontainers": "^8.13.2"
   }
 }