diff --git a/parity/cli.rs b/parity/cli.rs index e5a5a0983..84c941d33 100644 --- a/parity/cli.rs +++ b/parity/cli.rs @@ -136,6 +136,9 @@ Footprint Options: options. Legacy Options: + --geth Run in Geth-compatibility mode. Currently just sets + the IPC path to be the same as Geth's. Overrides + the --ipc-path/--ipcpath options. --datadir PATH Equivalent to --db-path PATH. --testnet Equivalent to --chain testnet. --networkid INDEX Equivalent to --network-id INDEX. @@ -214,6 +217,7 @@ pub struct Args { pub flag_logging: Option, pub flag_version: bool, // legacy... + pub flag_geth: bool, pub flag_nodekey: Option, pub flag_nodiscover: bool, pub flag_maxpeers: Option, diff --git a/parity/configuration.rs b/parity/configuration.rs index 83eadbc2e..7a797a2be 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -270,7 +270,7 @@ impl Configuration { pub fn ipc_settings(&self) -> IpcConfiguration { IpcConfiguration { enabled: !(self.args.flag_ipcdisable || self.args.flag_ipc_off), - socket_addr: self.args.flag_ipcpath.clone().unwrap_or(self.args.flag_ipc_path.clone()) + socket_addr: if self.args.flag_geth { "$HOME/.ethereum/geth.ipc".to_owned() } else { self.args.flag_ipcpath.clone().unwrap_or(self.args.flag_ipc_path.clone()) } .replace("$HOME", env::home_dir().unwrap().to_str().unwrap()), apis: self.args.flag_ipcapi.clone().unwrap_or(self.args.flag_ipc_apis.clone()), }