Support binary in `—p2p-private-key-file option (Consensys#8093)

Author: courtneyeh

CHANGELOG.md

@@ -14,5 +14,6 @@ the [releases page](https://github.com/Consensys/teku/releases).
 ### Additions and Improvements
 - Introduced [Validator Slashing Prevention feature](https://docs.teku.consensys.io/how-to/prevent-slashing/detect-slashing).
 - If the EL supports the `engine_getClientVersionV1` Engine API method, the default graffiti (when no graffiti has been configured by the validator) will include EL as well as CL version information. For more details, please see https://github.com/ethereum/execution-apis/pull/517.
+- `—p2p-private-key-file` command line option supports reading a binary private key file.
 
 ### Bug Fixes

networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/network/config/FilePrivateKeySource.java

@@ -20,6 +20,7 @@
 import io.libp2p.core.crypto.PrivKey;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.MalformedInputException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Objects;
@@ -37,7 +38,7 @@ public Bytes getOrGeneratePrivateKeyBytes() {
     try {
       File file = new File(fileName);
       if (!file.createNewFile()) {
-        return getPrivateKeyBytesFromFile();
+        return getPrivateKeyBytesFromTextFile();
       }
       final PrivKey privKey = KeyKt.generateKeyPair(KeyType.SECP256K1).component1();
       final Bytes privateKeyBytes = Bytes.wrap(KeyKt.marshalPrivateKey(privKey));
@@ -51,11 +52,23 @@ public Bytes getOrGeneratePrivateKeyBytes() {
     }
   }
 
-  private Bytes getPrivateKeyBytesFromFile() {
+  private Bytes getPrivateKeyBytesFromTextFile() {
     try {
       final Bytes privateKeyBytes = Bytes.fromHexString(Files.readString(Paths.get(fileName)));
       STATUS_LOG.usingGeneratedP2pPrivateKey(fileName, false);
       return privateKeyBytes;
+    } catch (MalformedInputException e) {
+      return getPrivateKeyBytesFromBytesFile();
+    } catch (IOException e) {
+      throw new RuntimeException("p2p private key file not found - " + fileName);
+    }
+  }
+
+  private Bytes getPrivateKeyBytesFromBytesFile() {
+    try {
+      final Bytes privateKeyBytes = Bytes.wrap(Files.readAllBytes(Paths.get(fileName)));
+      STATUS_LOG.usingGeneratedP2pPrivateKey(fileName, false);
+      return privateKeyBytes;
     } catch (IOException e) {
       throw new RuntimeException("p2p private key file not found - " + fileName);
     }

networking/p2p/src/test/java/tech/pegasys/teku/networking/p2p/network/config/FilePrivateKeySourceTest.java

@@ -37,7 +37,7 @@ void shouldCreateKeyAndSaveToFile(@TempDir Path tempDir) throws IOException {
   }
 
   @Test
-  void shouldGetKeyFromSavedFile(@TempDir Path tempDir) throws IOException {
+  void shouldGetKeyFromSavedTextFile(@TempDir Path tempDir) throws IOException {
     final Path file = tempDir.resolve("file.txt");
     final Bytes privateKey = Bytes.wrap(PrivateKeyGenerator.generate().bytes());
     Files.writeString(file, privateKey.toHexString());
@@ -46,6 +46,16 @@ void shouldGetKeyFromSavedFile(@TempDir Path tempDir) throws IOException {
     assertThat(privateKeySource.getOrGeneratePrivateKeyBytes()).isEqualTo(privateKey);
   }
 
+  @Test
+  void shouldGetKeyFromBinaryFile(@TempDir Path tempDir) throws IOException {
+    final Path file = tempDir.resolve("file.dat");
+    final Bytes privateKey = Bytes.wrap(PrivateKeyGenerator.generate().bytes());
+    Files.write(file, privateKey.toArray());
+    final PrivateKeySource privateKeySource = new FilePrivateKeySource(file.toString());
+
+    assertThat(privateKeySource.getOrGeneratePrivateKeyBytes()).isEqualTo(privateKey);
+  }
+
   @Test
   void shouldThrowExceptionIfInvalidFileName(@TempDir Path tempDir) {
     final PrivateKeySource privateKeySource =