[MINOR] added fromHexStringStrict to check for exactly 20 byte addresses

ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Address.java

@@ -84,8 +84,7 @@ public static Address extract(final Hash hash) {
    *
    * @param str An hexadecimal string (with or without the leading '0x') representing a valid
    *     account address.
-   * @return The parsed address.
-   * @throws NullPointerException if the provided string is {@code null}.
+   * @return The parsed address: {@code null} if the provided string is {@code null}.
    * @throws IllegalArgumentException if the string is either not hexadecimal, or not the valid
    *     representation of an address.
    */
@@ -96,6 +95,21 @@ public static Address fromHexString(final String str) {
     return new Address(BytesValue.fromHexStringLenient(str, SIZE));
   }
 
+  /**
+   * Parse an hexadecimal string representing an account address.
+   *
+   * @param str An hexadecimal string representing a valid account address (strictly 20 bytes).
+   * @return The parsed address.
+   * @throws IllegalArgumentException if the provided string is {@code null}.
+   * @throws IllegalArgumentException if the string is either not hexadecimal, or not the valid
+   *     representation of a 20 byte address.
+   */
+  public static Address fromHexStringStrict(final String str) {
+    checkArgument(str != null);
+
+    return new Address(BytesValue.fromHexString(str));
+  }
+
   private static Address precompiled(final int value) {
     // Keep it simple while we don't need precompiled above 127.
     checkArgument(value < Byte.MAX_VALUE);

ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressTest.java

@@ -51,4 +51,14 @@ public void accountAddresHashCode() {
   public void invalidAccountAddress() {
     Address.wrap(BytesValue.fromHexString("0x00101010"));
   }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void tooShortAccountAddress() {
+    Address.fromHexStringStrict("0x00101010");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void nullAccountAddress() {
+    Address.fromHexStringStrict(null);
+  }
 }

pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java

@@ -563,7 +563,7 @@ public void parse(
     commandLine.addSubcommand(
         RLPSubCommand.COMMAND_NAME, new RLPSubCommand(resultHandler.out(), in));
 
-    commandLine.registerConverter(Address.class, Address::fromHexString);
+    commandLine.registerConverter(Address.class, Address::fromHexStringStrict);
     commandLine.registerConverter(BytesValue.class, BytesValue::fromHexString);
     commandLine.registerConverter(Level.class, Level::valueOf);
     commandLine.registerConverter(SyncMode.class, SyncMode::fromString);

pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java

@@ -347,6 +347,17 @@ public void permissionsEnabledWithInvalidContractAddressMustError() {
     assertThat(commandOutput.toString()).isEmpty();
   }
 
+  @Test
+  public void permissionsEnabledWithTooShortContractAddressMustError() {
+    parseCommand(
+        "--permissions-nodes-contract-enabled", "--permissions-nodes-contract-address", "0x1234");
+
+    verifyZeroInteractions(mockRunnerBuilder);
+
+    assertThat(commandErrorOutput.toString()).contains("Invalid value");
+    assertThat(commandOutput.toString()).isEmpty();
+  }
+
   @Test
   public void permissionsSmartContractMustUseOption() {
 
@@ -1800,7 +1811,7 @@ public void pantheonDoesNotStartInMiningModeIfCoinbaseNotSet() {
 
   @Test
   public void miningIsEnabledWhenSpecified() throws Exception {
-    final String coinbaseStr = String.format("%020x", 1);
+    final String coinbaseStr = String.format("%040x", 1);
     parseCommand("--miner-enabled", "--miner-coinbase=" + coinbaseStr);
 
     final ArgumentCaptor<MiningParameters> miningArg =