Fix incorrect VC default HTTP token path when the --datadir flag is present

[jimmygchen]

Issue Addressed

Fixes a validator client bug introduced in #6577.

When a custom --datadir flag is provided, the default http token path changes to $HOME/.lighthouse/mainnet/validators/api-token.txt, rather than the previous default <datadir>/validators/api-token.txt

This causes a CRIT in some setups where the validator client does not have write access to the home directory (e.g. eth-docker):

CRIT Failed to start validator client        reason: Unable to create parent directories for "/nonexistent/.lighthouse/mainnet/validators/api-token.txt": Os { code: 13, kind: PermissionDenied, message: "Permission denied" }

Proposed Changes

Set the correct default VC API token path, if a datadir or validators-dir is provided.

[jimmygchen]

This wasn't included in the v6.0.1 release, so a patch isn't required 😌

[pawanjay176]

Took me a while to see the difference. Nice catch!

[jimmygchen]

@mergify requeue

[mergify]

requeue

❌ This pull request head commit has not been previously disembarked from queue.

[jimmygchen]

@mergify queue

[mergify]

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 87b72de

[syjn99]

Thanks for catching this! I made a mistake in my previous contribution, and I appreciate your help in fixing it.

[jimmygchen]

All good, I missed it in review too 🙏