Update testnet tooling (#1001)

* Add progress on new deposits

* Add deposited command to account manager

* Remove old lcli::helpers mod

* Clean clap_utils

* Refactor lcli deposit contract commands to use IPC

* Make testnet optional for environment

* Use dbg formatting for deploy address

* Add command to generate bootnode enr

* Ensure lcli returns with 1 on error

* Ensure account manager returns 1 on error

* Disallow deposits to the zero address

* Update web3 in eth1 crate

* Ensure correct lighthouse dir is created

* Reduce deposit gas requirement

* Update cargo.lock

* Add progress on new deposits

* Add deposited command to account manager

* Remove old lcli::helpers mod

* Clean clap_utils

* Refactor lcli deposit contract commands to use IPC

* Add command to generate bootnode enr

* Ensure lcli returns with 1 on error

* Ensure account manager returns 1 on error

* Update web3 in eth1 crate

* Update Cargo.lock

* Move lcli out of main install script

* Change --limit to --at-least

* Change --datadir to --validator-dir

* Remove duplication in docs

lcli/src/refund_deposit_contract.rs

@@ -1,12 +1,10 @@
-use crate::deploy_deposit_contract::parse_password;
 use clap::ArgMatches;
 use environment::Environment;
-use eth2_testnet_config::Eth2TestnetConfig;
-use futures::{future, Future};
+use futures::Future;
 use std::path::PathBuf;
 use types::EthSpec;
 use web3::{
-    transports::Http,
+    transports::Ipc,
     types::{Address, TransactionRequest, U256},
     Web3,
 };
@@ -15,102 +13,28 @@ use web3::{
 pub const STEAL_FN_SIGNATURE: &[u8] = &[0xcf, 0x7a, 0x89, 0x65];
 
 pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<(), String> {
-    let endpoint = matches
-        .value_of("eth1-endpoint")
-        .ok_or_else(|| "eth1-endpoint not specified")?;
+    let eth1_ipc_path: PathBuf = clap_utils::parse_required(matches, "eth1-ipc")?;
+    let from: Address = clap_utils::parse_required(matches, "from-address")?;
+    let contract_address: Address = clap_utils::parse_required(matches, "contract-address")?;
 
-    let account_index = matches
-        .value_of("account-index")
-        .ok_or_else(|| "No account-index".to_string())?
-        .parse::<usize>()
-        .map_err(|e| format!("Unable to parse account-index: {}", e))?;
+    let (_event_loop_handle, transport) =
+        Ipc::new(eth1_ipc_path).map_err(|e| format!("Unable to connect to eth1 IPC: {:?}", e))?;
+    let web3 = Web3::new(transport);
 
-    let password_opt = parse_password(matches)?;
-
-    let testnet_dir = matches
-        .value_of("testnet-dir")
-        .ok_or_else(|| ())
-        .and_then(|dir| dir.parse::<PathBuf>().map_err(|_| ()))
-        .unwrap_or_else(|_| {
-            dirs::home_dir()
-                .map(|home| home.join(".lighthouse").join("testnet"))
-                .expect("should locate home directory")
-        });
-
-    let eth2_testnet_config: Eth2TestnetConfig<T> = Eth2TestnetConfig::load(testnet_dir)?;
-
-    let (_event_loop, transport) = Http::new(&endpoint).map_err(|e| {
-        format!(
-            "Failed to start HTTP transport connected to ganache: {:?}",
-            e
-        )
-    })?;
-
-    let web3_1 = Web3::new(transport);
-    let web3_2 = web3_1.clone();
-
-    // Convert from `types::Address` to `web3::types::Address`.
-    let deposit_contract = Address::from_slice(
-        eth2_testnet_config
-            .deposit_contract_address()?
-            .as_fixed_bytes(),
-    );
-
-    let future = web3_1
-        .eth()
-        .accounts()
-        .map_err(|e| format!("Failed to get accounts: {:?}", e))
-        .and_then(move |accounts| {
-            accounts
-                .get(account_index)
-                .cloned()
-                .ok_or_else(|| "Insufficient accounts for deposit".to_string())
-        })
-        .and_then(move |from_address| {
-            let future: Box<dyn Future<Item = Address, Error = String> + Send> =
-                if let Some(password) = password_opt {
-                    // Unlock for only a single transaction.
-                    let duration = None;
-
-                    let future = web3_1
-                        .personal()
-                        .unlock_account(from_address, &password, duration)
-                        .then(move |result| match result {
-                            Ok(true) => Ok(from_address),
-                            Ok(false) => Err("Eth1 node refused to unlock account".to_string()),
-                            Err(e) => Err(format!("Eth1 unlock request failed: {:?}", e)),
-                        });
-
-                    Box::new(future)
-                } else {
-                    Box::new(future::ok(from_address))
-                };
-
-            future
-        })
-        .and_then(move |from| {
-            let tx_request = TransactionRequest {
+    env.runtime().block_on(
+        web3.eth()
+            .send_transaction(TransactionRequest {
                 from,
-                to: Some(deposit_contract),
+                to: Some(contract_address),
                 gas: Some(U256::from(400_000)),
                 gas_price: None,
                 value: Some(U256::zero()),
                 data: Some(STEAL_FN_SIGNATURE.into()),
                 nonce: None,
                 condition: None,
-            };
-
-            web3_2
-                .eth()
-                .send_transaction(tx_request)
-                .map_err(|e| format!("Failed to call deposit fn: {:?}", e))
-        })
-        .map(move |tx| info!("Refund transaction submitted: eth1_tx_hash: {:?}", tx))
-        .map_err(move |e| error!("Unable to submit refund transaction: error: {}", e));
-
-    env.runtime()
-        .block_on(future)
-        .map_err(|()| "Failed to send transaction".to_string())?;
+            })
+            .map_err(|e| format!("Failed to call deposit fn: {:?}", e)),
+    )?;
 
     Ok(())
 }