From 387d0743e6b3a4a408ddd9331dafb779f2b72b00 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Sat, 19 Mar 2016 23:51:24 +0100
Subject: [PATCH] Allow 0x prefix for --author.

---
 parity/main.rs   | 4 ++--
 util/src/hash.rs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/parity/main.rs b/parity/main.rs
index c7e534993..56e70cf2a 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -46,6 +46,7 @@ use env_logger::LogBuilder;
 use ctrlc::CtrlC;
 use util::*;
 use util::panics::{MayPanic, ForwardPanic, PanicHandler};
+use util::keys::store::*;
 use ethcore::spec::*;
 use ethcore::client::*;
 use ethcore::service::{ClientService, NetSyncMessage};
@@ -55,7 +56,6 @@ use ethminer::{Miner, MinerService};
 use docopt::Docopt;
 use daemonize::Daemonize;
 use number_prefix::{binary_prefix, Standalone, Prefixed};
-use util::keys::store::*;
 
 fn die_with_message(msg: &str) -> ! {
 	println!("ERROR: {}", msg);
@@ -315,7 +315,7 @@ impl Configuration {
 
 	fn author(&self) -> Address {
 		let d = self.args.flag_etherbase.as_ref().unwrap_or(&self.args.flag_author);
-		Address::from_str(d).unwrap_or_else(|_| {
+		Address::from_str(clean_0x(d)).unwrap_or_else(|_| {
 			die!("{}: Invalid address for --author. Must be 40 hex characters, without the 0x at the beginning.", d)
 		})
 	}
diff --git a/util/src/hash.rs b/util/src/hash.rs
index fce0720d1..b7fddbe8b 100644
--- a/util/src/hash.rs
+++ b/util/src/hash.rs
@@ -63,7 +63,8 @@ pub trait FixedHash: Sized + BytesConvertable + Populatable + FromStr + Default
 	fn low_u64(&self) -> u64;
 }
 
-fn clean_0x(s: &str) -> &str {
+/// Return `s` without the `0x` at the beginning of it, if any.
+pub fn clean_0x(s: &str) -> &str {
 	if s.len() >= 2 && &s[0..2] == "0x" {
 		&s[2..]
 	} else {