Prepare for public testnet (#628)

* Update to spec v0.9.0 * Update to v0.9.1 * Bump spec tags for v0.9.1 * Formatting, fix CI failures * Resolve accidental KeyPair merge conflict * Document new BeaconState functions * Add `validator` changes from `validator-to-rest` * Add initial (failing) REST api tests * Fix signature parsing * Add more tests * Refactor http router * Add working tests for publish beacon block * Add validator duties tests * Move account_manager under `lighthouse` binary * Unify logfile handling in `environment` crate. * Fix incorrect cache drops in `advance_caches` * Update fork choice for v0.9.1 * Add `deposit_contract` crate * Add progress on validator onboarding * Add unfinished attesation code * Update account manager CLI * Write eth1 data file as hex string * Integrate ValidatorDirectory with validator_client * Move ValidatorDirectory into validator_client * Clean up some FIXMEs * Add beacon_chain_sim * Fix a few docs/logs * Expand `beacon_chain_sim` * Fix spec for `beacon_chain_sim * More testing for api * Start work on attestation endpoint * Reject empty attestations * Allow attestations to genesis block * Add working tests for `rest_api` validator endpoint * Remove grpc from beacon_node * Start heavy refactor of validator client - Block production is working * Prune old validator client files * Start works on attestation service * Add attestation service to validator client * Use full pubkey for validator directories * Add validator duties post endpoint * Use par_iter for keypair generation * Use bulk duties request in validator client * Add version http endpoint tests * Add interop keys and startup wait * Ensure a prompt exit * Add duties pruning * Fix compile error in beacon node tests * Add github workflow * Modify rust.yaml * Modify gitlab actions * Add to CI file * Add sudo to CI npm install * Move cargo fmt to own job in tests * Fix cargo fmt in CI * Add rustup update before cargo fmt * Change name of CI job * Make other CI jobs require cargo fmt * Add CI badge * Remove gitlab and travis files * Add different http timeout for debug * Update docker file, use makefile in CI * Use make in the dockerfile, skip the test * Use the makefile for debug GI test * Update book * Tidy grpc and misc things * Apply discv5 fixes * Address other minor issues * Fix warnings * Attempt fix for addr parsing * Tidy validator config, CLIs * Tidy comments * Tidy signing, reduce ForkService duplication * Fail if skipping too many slots * Set default recent genesis time to 0 * Add custom http timeout to validator * Fix compile bug in node_test_rig * Remove old bootstrap flag from val CLI * Update docs * Tidy val client * Change val client log levels * Add comments, more validity checks * Fix compile error, add comments * Undo changes to eth2-libp2p/src * Reduce duplication of keypair generation * Add more logging for validator duties * Fix beacon_chain_sim, nitpicks * Fix compile error, minor nits * Update to use v0.9.2 version of deposit contract * Add efforts to automate eth1 testnet deployment * Fix lcli testnet deployer * Modify bn CLI to parse eth2_testnet_dir * Progress with account_manager deposit tools * Make account manager submit deposits * Add password option for submitting deposits * Allow custom deposit amount * Add long names to lcli clap * Add password option to lcli deploy command * Fix minor bugs whilst testing * Address Michael's comments * Add refund-deposit-contract to lcli * Use time instead of skip count for denying long skips * Improve logging for eth1 * Fix bug with validator services exiting on error * Drop the block cache after genesis * Modify eth1 testnet config * Improve eth1 logging * Make validator wait until genesis time * Fix bug in eth1 voting * Add more logging to eth1 voting * Handle errors in eth1 http module * Set SECONDS_PER_DAY to sensible minimum * Shorten delay before testnet start * Ensure eth1 block is produced without any votes * Improve eth1 logging * Fix broken tests in eth1 * Tidy code in rest_api * Fix failing test in deposit_contract * Make CLI args more consistent * Change validator/duties endpoint * Add time-based skip slot limiting * Add new error type missed in previous commit * Add log when waiting for genesis * Refactor beacon node CLI * Remove unused dep * Add lcli eth1-genesis command * Fix bug in master merge * Apply clippy lints to beacon node * Add support for YamlConfig in Eth2TestnetDir * Upgrade tesnet deposit contract version * Remove unnecessary logging and correct formatting * Add a hardcoded eth2 testnet config * Ensure http server flag works. Overwrite configs with flags. * Ensure boot nodes are loaded from testnet dir * Fix account manager CLI bugs * Fix bugs with beacon node cli * Allow testnet dir without boot nodes * Write genesis state as SSZ * Remove ---/n from the start of testnet_dir files * Set default libp2p address * Tidy account manager CLI, add logging * Add check to see if testnet dir exists * Apply reviewers suggestions * Add HeadTracker struct * Add fork choice persistence * Shorten slot time for simulator * Add the /beacon/heads API endpoint * Update hardcoded testnet * Add tests for BeaconChain persistence + fix bugs * Extend BeaconChain persistence testing * Ensure chain is finalized b4 persistence tests * Ensure boot_enr.yaml is include in binary * Refactor beacon_chain_sim * Move files about in beacon sim * Update beacon_chain_sim * Fix bug with deposit inclusion * Increase log in genesis service, fix todo * Tidy sim, fix broken rest_api tests * Fix more broken tests * Update testnet * Fix broken rest api test * Tidy account manager CLI * Use tempdir for account manager * Stop hardcoded testnet dir from creating dir * Rename Eth2TestnetDir to Eth2TestnetConfig * Change hardcoded -> hard_coded * Tidy account manager * Add log to account manager * Tidy, ensure head tracker is loaded from disk * Tidy beacon chain builder * Tidy eth1_chain * Adds log support for simulator * Revert "Adds log support for simulator" This reverts commit ec77c66a052350f551db145cf20f213823428dd3. * Adds log support for simulator * Tidy after self-review * Change default log level * Address Michael's delicious PR comments * Fix off-by-one in tests
2019-12-03 15:28:57 +11:00
parent 4b4bc6247d
commit a0549e3842
74 changed files with 3417 additions and 1294 deletions
@@ -1 +1 @@
-contract/
+contracts/
@@ -3,21 +3,24 @@
 //!
 //! These files are required for some `include_bytes` calls used in this crate.

-use reqwest::Response;
 use serde_json::Value;
 use std::env;
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;

-const GITHUB_RAW: &str = "https://raw.githubusercontent.com";
-const SPEC_REPO: &str = "ethereum/eth2.0-specs";
-const SPEC_TAG: &str = "v0.8.3";
-const ABI_FILE: &str = "validator_registration.json";
-const BYTECODE_FILE: &str = "validator_registration.bytecode";
+const TAG: &str = "v0.9.2";
+const UNSAFE_TAG: &str = "v0.9.2.1";
+
+fn spec_url() -> String {
+    format!("https://raw.githubusercontent.com/ethereum/eth2.0-specs/{}/deposit_contract/contracts/validator_registration.json", TAG)
+}
+fn testnet_url() -> String {
+    format!("https://raw.githubusercontent.com/sigp/unsafe-eth2-deposit-contract/{}/unsafe_validator_registration.json", UNSAFE_TAG)
+}

 fn main() {
-    match init_deposit_contract_abi() {
+    match get_all_contracts() {
        Ok(()) => (),
        Err(e) => panic!(e),
    }
@@ -25,14 +28,33 @@ fn main() {

 /// Attempts to download the deposit contract ABI from github if a local copy is not already
 /// present.
-pub fn init_deposit_contract_abi() -> Result<(), String> {
-    let abi_file = abi_dir().join(format!("{}_{}", SPEC_TAG, ABI_FILE));
-    let bytecode_file = abi_dir().join(format!("{}_{}", SPEC_TAG, BYTECODE_FILE));
+pub fn get_all_contracts() -> Result<(), String> {
+    download_deposit_contract(
+        &spec_url(),
+        "validator_registration.json",
+        "validator_registration.bytecode",
+    )?;
+    download_deposit_contract(
+        &testnet_url(),
+        "testnet_validator_registration.json",
+        "testnet_validator_registration.bytecode",
+    )
+}
+
+/// Attempts to download the deposit contract ABI from github if a local copy is not already
+/// present.
+pub fn download_deposit_contract(
+    url: &str,
+    abi_file: &str,
+    bytecode_file: &str,
+) -> Result<(), String> {
+    let abi_file = abi_dir().join(format!("{}_{}", TAG, abi_file));
+    let bytecode_file = abi_dir().join(format!("{}_{}", TAG, bytecode_file));

    if abi_file.exists() {
        // Nothing to do.
    } else {
-        match download_abi() {
+        match reqwest::get(url) {
            Ok(mut response) => {
                let mut abi_file = File::create(abi_file)
                    .map_err(|e| format!("Failed to create local abi file: {:?}", e))?;
@@ -71,22 +93,13 @@ pub fn init_deposit_contract_abi() -> Result<(), String> {
    Ok(())
 }

-/// Attempts to download the deposit contract file from the Ethereum github.
-fn download_abi() -> Result<Response, String> {
-    reqwest::get(&format!(
-        "{}/{}/{}/deposit_contract/contracts/{}",
-        GITHUB_RAW, SPEC_REPO, SPEC_TAG, ABI_FILE
-    ))
-    .map_err(|e| format!("Failed to download deposit ABI from github: {:?}", e))
-}
-
 /// Returns the directory that will be used to store the deposit contract ABI.
 fn abi_dir() -> PathBuf {
    let base = env::var("CARGO_MANIFEST_DIR")
        .expect("should know manifest dir")
        .parse::<PathBuf>()
        .expect("should parse manifest dir as path")
-        .join("contract");
+        .join("contracts");

    std::fs::create_dir_all(base.clone())
        .expect("should be able to create abi directory in manifest");
@@ -1,21 +1,32 @@
 use ethabi::{Contract, Token};
 use ssz::Encode;
+use tree_hash::TreeHash;
 use types::DepositData;

 pub use ethabi::Error;

 pub const CONTRACT_DEPLOY_GAS: usize = 4_000_000;
 pub const DEPOSIT_GAS: usize = 4_000_000;
-pub const ABI: &[u8] = include_bytes!("../contract/v0.8.3_validator_registration.json");
-pub const BYTECODE: &[u8] = include_bytes!("../contract/v0.8.3_validator_registration.bytecode");
+pub const ABI: &[u8] = include_bytes!("../contracts/v0.9.2_validator_registration.json");
+pub const BYTECODE: &[u8] = include_bytes!("../contracts/v0.9.2_validator_registration.bytecode");
+
+pub mod testnet {
+    pub const ABI: &[u8] =
+        include_bytes!("../contracts/v0.9.2_testnet_validator_registration.json");
+    pub const BYTECODE: &[u8] =
+        include_bytes!("../contracts/v0.9.2_testnet_validator_registration.bytecode");
+}

 pub fn eth1_tx_data(deposit_data: &DepositData) -> Result<Vec<u8>, Error> {
    let params = vec![
        Token::Bytes(deposit_data.pubkey.as_ssz_bytes()),
        Token::Bytes(deposit_data.withdrawal_credentials.as_ssz_bytes()),
        Token::Bytes(deposit_data.signature.as_ssz_bytes()),
+        Token::FixedBytes(deposit_data.tree_hash_root().as_ssz_bytes()),
    ];

+    // Here we make an assumption that the `crate::testnet::ABI` has a superset of the features of
+    // the crate::ABI`.
    let abi = Contract::load(ABI)?;
    let function = abi.function("deposit")?;
    function.encode_input(&params)
@@ -51,6 +62,6 @@ mod tests {

        let data = eth1_tx_data(&deposit).expect("should produce tx data");

-        assert_eq!(data.len(), 388, "bytes should be correct length");
+        assert_eq!(data.len(), 420, "bytes should be correct length");
    }
 }