Use the same keystore directory names as Lighthouse

Rationale: this makes moving keys between the clients eaiser

Other changes:

* Restore building with custom presets
  (defaultRuntimePreset is not a template in this mode)
This commit is contained in:
Zahary Karadjov 2020-08-06 21:14:44 +03:00
parent f4c16ed0db
commit 9861eb1152
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
2 changed files with 2 additions and 2 deletions

View File

@ -171,7 +171,7 @@ proc main() {.async.} =
if cfg.cmd == StartUpCommand.generateSimulationDeposits: if cfg.cmd == StartUpCommand.generateSimulationDeposits:
let let
walletData = WalletDataForDeposits(mnemonic: generateMnemonic(rng[])) walletData = WalletDataForDeposits(mnemonic: generateMnemonic(rng[]))
runtimePreset = defaultRuntimePreset() runtimePreset = defaultRuntimePreset
createDir(string cfg.outValidatorsDir) createDir(string cfg.outValidatorsDir)
createDir(string cfg.outSecretsDir) createDir(string cfg.outSecretsDir)

View File

@ -105,7 +105,7 @@ proc saveKeystore(rng: var BrHmacDrbgContext,
signingKey: ValidatorPrivKey, signingPubKey: ValidatorPubKey, signingKey: ValidatorPrivKey, signingPubKey: ValidatorPubKey,
signingKeyPath: KeyPath): Result[void, KeystoreGenerationError] = signingKeyPath: KeyPath): Result[void, KeystoreGenerationError] =
let let
keyName = $signingPubKey keyName = "0x" & $signingPubKey
validatorDir = validatorsDir / keyName validatorDir = validatorsDir / keyName
if not existsDir(validatorDir): if not existsDir(validatorDir):