Version v1.0.6 (#2126 )

## Issue Addressed NA ## Proposed Changes - Bump versions - Run `cargo update` ## Additional Info NA
Remove default beacon node value from clap (#2121 )
2026-03-07 10:41:43 +00:00 · 2020-12-28 23:38:02 +00:00 · 2020-12-28 08:23:59 +00:00 · 2020-12-28 05:09:19 +00:00 · 2020-12-28 01:25:33 +00:00
12 changed files with 176 additions and 80 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -378,14 +378,32 @@ dependencies = [
 ]

 [[package]]
-name = "async-std"
-version = "1.7.0"
+name = "async-process"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e82538bc65a25dbdff70e4c5439d52f068048ab97cdea0acd73f131594caa1"
+checksum = "4c8cea09c1fb10a317d1b5af8024eeba256d6554763e85ecd90ff8df31c7bbda"
 dependencies = [
+ "async-io",
+ "blocking",
+ "cfg-if 0.1.10",
+ "event-listener",
+ "futures-lite",
+ "once_cell",
+ "signal-hook",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "async-std"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f9f84f1280a2b436a2c77c2582602732b6c2f4321d5494d6e799e6c367859a8"
+dependencies = [
+ "async-channel",
 "async-global-executor",
 "async-io",
 "async-mutex",
+ "async-process",
 "blocking",
 "crossbeam-utils 0.8.1",
 "futures-channel",
@@ -398,7 +416,7 @@ dependencies = [
 "memchr",
 "num_cpus",
 "once_cell",
- "pin-project-lite 0.1.11",
+ "pin-project-lite 0.2.0",
 "pin-utils",
 "slab",
 "wasm-bindgen-futures",
@@ -588,7 +606,7 @@ dependencies = [

 [[package]]
 name = "beacon_node"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
 "beacon_chain",
 "clap",
@@ -813,7 +831,7 @@ dependencies = [

 [[package]]
 name = "boot_node"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
 "beacon_node",
 "clap",
@@ -1027,7 +1045,7 @@ dependencies = [
 "ansi_term 0.11.0",
 "atty",
 "bitflags",
- "strsim 0.8.0",
+ "strsim",
 "textwrap",
 "unicode-width",
 "vec_map",
@@ -1639,23 +1657,11 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "docopt"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
-dependencies = [
- "lazy_static",
- "regex",
- "serde",
- "strsim 0.9.3",
-]
-
 [[package]]
 name = "dtoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
+checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e"

 [[package]]
 name = "ecdsa"
@@ -2324,9 +2330,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"

 [[package]]
 name = "funty"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"

 [[package]]
 name = "futures"
@@ -2533,10 +2539,11 @@ dependencies = [

 [[package]]
 name = "ghash"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6e27f0689a6e15944bdce7e45425efb87eaa8ab0c6e87f11d0987a9133e2531"
+checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
 dependencies = [
+ "opaque-debug 0.3.0",
 "polyval",
 ]

@@ -3207,9 +3214,9 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"

 [[package]]
 name = "js-sys"
@@ -3272,34 +3279,35 @@ dependencies = [

 [[package]]
 name = "lalrpop"
-version = "0.19.1"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60fb56191fb8ed5311597e5750debe6779c9fdb487dbaa5ff302592897d7a2c8"
+checksum = "efcc8a1810b0880931ce6ada8409110c3eea6becdaa9dc891426d129f49c7469"
 dependencies = [
 "ascii-canvas",
 "atty",
 "bit-set",
 "diff",
- "docopt",
 "ena",
 "itertools 0.9.0",
 "lalrpop-util",
 "petgraph",
+ "pico-args",
 "regex",
 "regex-syntax",
- "serde",
- "serde_derive",
- "sha2 0.8.2",
 "string_cache",
 "term 0.5.2",
+ "tiny-keccak 2.0.2",
 "unicode-xid",
 ]

 [[package]]
 name = "lalrpop-util"
-version = "0.19.1"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6771161eff561647fad8bb7e745e002c304864fb8f436b52b30acda51fca4408"
+checksum = "68b01a98b09a1724a37353d44a62d758e087fb4ae8133108e6dcc51062d15d68"
+dependencies = [
+ "regex",
+]

 [[package]]
 name = "lazy_static"
@@ -3312,7 +3320,7 @@ dependencies = [

 [[package]]
 name = "lcli"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
 "bls",
 "clap",
@@ -3704,7 +3712,7 @@ dependencies = [

 [[package]]
 name = "lighthouse"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
 "account_manager",
 "account_utils",
@@ -4386,9 +4394,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

 [[package]]
 name = "openssl"
-version = "0.10.31"
+version = "0.10.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187"
+checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
 dependencies = [
 "bitflags",
 "cfg-if 1.0.0",
@@ -4415,9 +4423,9 @@ dependencies = [

 [[package]]
 name = "openssl-sys"
-version = "0.9.59"
+version = "0.9.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe"
+checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
 dependencies = [
 "autocfg 1.0.1",
 "cc",
@@ -4564,6 +4572,12 @@ dependencies = [
 "siphasher",
 ]

+[[package]]
+name = "pico-args"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1"
+
 [[package]]
 name = "pin-project"
 version = "0.4.27"
@@ -4671,11 +4685,12 @@ dependencies = [

 [[package]]
 name = "polyval"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4fd92d8e0c06d08525d2e2643cc2b5c80c69ae8eb12c18272d501cd7079ccc0"
+checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
 dependencies = [
 "cpuid-bool 0.2.0",
+ "opaque-debug 0.3.0",
 "universal-hash",
 ]

@@ -5788,6 +5803,16 @@ dependencies = [
 "loom",
 ]

+[[package]]
+name = "signal-hook"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.3.0"
@@ -6246,7 +6271,6 @@ dependencies = [
 "new_debug_unreachable",
 "phf_shared",
 "precomputed-hash",
- "serde",
 ]

 [[package]]
@@ -6255,12 +6279,6 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"

-[[package]]
-name = "strsim"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
-
 [[package]]
 name = "subtle"
 version = "1.0.0"
@@ -6284,9 +6302,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.55"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a"
+checksum = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -6409,18 +6427,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
+checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
+checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/beacon_node/Cargo.toml
+++ b/beacon_node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "beacon_node"
-version = "1.0.5"
+version = "1.0.6"
 authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com"]
 edition = "2018"

--- a/beacon_node/eth1/src/service.rs
+++ b/beacon_node/eth1/src/service.rs
@@ -670,7 +670,9 @@ impl Service {
            let outcome = self
                .update_deposit_cache(Some(new_block_numbers_deposit), &endpoints)
                .await
-                .map_err(|e| format!("Failed to update eth1 cache: {:?}", process_err(e)))?;
+                .map_err(|e| {
+                    format!("Failed to update eth1 deposit cache: {:?}", process_err(e))
+                })?;

            trace!(
                self.log,
@@ -686,7 +688,7 @@ impl Service {
            let outcome = self
                .update_block_cache(Some(new_block_numbers_block_cache), &endpoints)
                .await
-                .map_err(|e| format!("Failed to update eth1 cache: {:?}", process_err(e)))?;
+                .map_err(|e| format!("Failed to update eth1 block cache: {:?}", process_err(e)))?;

            trace!(
                self.log,
--- a/boot_node/Cargo.toml
+++ b/boot_node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "boot_node"
-version = "1.0.5"
+version = "1.0.6"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 edition = "2018"

--- a/common/lighthouse_version/src/lib.rs
+++ b/common/lighthouse_version/src/lib.rs
@@ -10,7 +10,7 @@ use target_info::Target;
 /// `Lighthouse/v0.2.0-1419501f2+`
 pub const VERSION: &str = git_version!(
    args = ["--always", "--dirty=+", "--abbrev=7"],
-    prefix = "Lighthouse/v1.0.5-",
+    prefix = "Lighthouse/v1.0.6-",
    fallback = "unknown"
 );

--- a/lcli/Cargo.toml
+++ b/lcli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "lcli"
 description = "Lighthouse CLI (modeled after zcli)"
-version = "1.0.5"
+version = "1.0.6"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"

--- a/lighthouse/Cargo.toml
+++ b/lighthouse/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lighthouse"
-version = "1.0.5"
+version = "1.0.6"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 edition = "2018"

--- a/slasher/src/database.rs
+++ b/slasher/src/database.rs
@@ -4,6 +4,7 @@ use crate::{
 };
 use byteorder::{BigEndian, ByteOrder};
 use lmdb::{Cursor, Database, DatabaseFlags, Environment, RwTransaction, Transaction, WriteFlags};
+use serde::Deserialize;
 use ssz::{Decode, Encode};
 use std::marker::PhantomData;
 use std::sync::Arc;
@@ -12,7 +13,7 @@ use types::{
 };

 /// Current database schema version, to check compatibility of on-disk DB with software.
-const CURRENT_SCHEMA_VERSION: u64 = 1;
+pub const CURRENT_SCHEMA_VERSION: u64 = 2;

 /// Metadata about the slashing database itself.
 const METADATA_DB: &str = "metadata";
@@ -209,15 +210,7 @@ impl<E: EthSpec> SlasherDB<E> {

        let mut txn = db.begin_rw_txn()?;

-        if let Some(schema_version) = db.load_schema_version(&mut txn)? {
-            if schema_version != CURRENT_SCHEMA_VERSION {
-                return Err(Error::IncompatibleSchemaVersion {
-                    database_schema_version: schema_version,
-                    software_schema_version: CURRENT_SCHEMA_VERSION,
-                });
-            }
-        }
-        db.store_schema_version(&mut txn)?;
+        db.migrate(&mut txn)?;

        if let Some(on_disk_config) = db.load_config(&mut txn)? {
            if !db.config.is_compatible(&on_disk_config) {
@@ -227,7 +220,7 @@ impl<E: EthSpec> SlasherDB<E> {
                });
            }
        }
-        db.store_config(&mut txn)?;
+        db.store_config(&db.config, &mut txn)?;
        txn.commit()?;

        Ok(db)
@@ -263,7 +256,14 @@ impl<E: EthSpec> SlasherDB<E> {
        Ok(())
    }

-    pub fn load_config(&self, txn: &mut RwTransaction<'_>) -> Result<Option<Config>, Error> {
+    /// Load a config from disk.
+    ///
+    /// This is generic in order to allow loading of configs for different schema versions.
+    /// Care should be taken to ensure it is only called for `Config`-like `T`.
+    pub fn load_config<'a, T: Deserialize<'a>>(
+        &self,
+        txn: &'a mut RwTransaction<'_>,
+    ) -> Result<Option<T>, Error> {
        Ok(txn
            .get(self.metadata_db, &METADATA_CONFIG_KEY)
            .optional()?
@@ -271,11 +271,11 @@ impl<E: EthSpec> SlasherDB<E> {
            .transpose()?)
    }

-    pub fn store_config(&self, txn: &mut RwTransaction<'_>) -> Result<(), Error> {
+    pub fn store_config(&self, config: &Config, txn: &mut RwTransaction<'_>) -> Result<(), Error> {
        txn.put(
            self.metadata_db,
            &METADATA_CONFIG_KEY,
-            &bincode::serialize(self.config.as_ref())?,
+            &bincode::serialize(config)?,
            Self::write_flags(),
        )?;
        Ok(())
--- a/slasher/src/error.rs
+++ b/slasher/src/error.rs
@@ -25,6 +25,7 @@ pub enum Error {
        on_disk_config: Config,
        config: Config,
    },
+    ConfigMissing,
    DistanceTooLarge,
    DistanceCalculationOverflow,
    /// Missing an attester record that we expected to exist.
--- a/slasher/src/lib.rs
+++ b/slasher/src/lib.rs
@@ -9,6 +9,7 @@ pub mod config;
 mod database;
 mod error;
 pub mod metrics;
+mod migrate;
 mod slasher;
 pub mod test_utils;
 mod utils;
--- a/slasher/src/migrate.rs
+++ b/slasher/src/migrate.rs
@@ -0,0 +1,74 @@
+use crate::{database::CURRENT_SCHEMA_VERSION, Config, Error, SlasherDB};
+use lmdb::RwTransaction;
+use serde_derive::{Deserialize, Serialize};
+use std::path::PathBuf;
+use types::EthSpec;
+
+/// Config from schema version 1, for migration to version 2+.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ConfigV1 {
+    database_path: PathBuf,
+    chunk_size: usize,
+    validator_chunk_size: usize,
+    history_length: usize,
+    update_period: u64,
+    max_db_size_mbs: usize,
+}
+
+type ConfigV2 = Config;
+
+impl Into<ConfigV2> for ConfigV1 {
+    fn into(self) -> ConfigV2 {
+        Config {
+            database_path: self.database_path,
+            chunk_size: self.chunk_size,
+            validator_chunk_size: self.validator_chunk_size,
+            history_length: self.history_length,
+            update_period: self.update_period,
+            max_db_size_mbs: self.max_db_size_mbs,
+            broadcast: false,
+        }
+    }
+}
+
+impl<E: EthSpec> SlasherDB<E> {
+    /// If the database exists, and has a schema, attempt to migrate it to the current version.
+    pub fn migrate(&self, txn: &mut RwTransaction<'_>) -> Result<(), Error> {
+        if let Some(schema_version) = self.load_schema_version(txn)? {
+            match (schema_version, CURRENT_SCHEMA_VERSION) {
+                // The migration from v1 to v2 is a bit messy because v1.0.5 silently
+                // changed the schema to v2, so a v1 schema could have either a v1 or v2
+                // config.
+                (1, 2) => {
+                    match self.load_config::<ConfigV1>(txn) {
+                        Ok(Some(config_v1)) => {
+                            // Upgrade to v2 config and store on disk.
+                            let config_v2 = config_v1.into();
+                            self.store_config(&config_v2, txn)?;
+                        }
+                        Ok(None) => {
+                            // Impossible to have schema version and no config.
+                            return Err(Error::ConfigMissing);
+                        }
+                        Err(_) => {
+                            // If loading v1 config failed, ensure loading v2 config succeeds.
+                            // No further action is needed.
+                            let _config_v2 = self.load_config::<ConfigV2>(txn)?;
+                        }
+                    }
+                }
+                (x, y) if x == y => {}
+                (_, _) => {
+                    return Err(Error::IncompatibleSchemaVersion {
+                        database_schema_version: schema_version,
+                        software_schema_version: CURRENT_SCHEMA_VERSION,
+                    });
+                }
+            }
+        }
+
+        // If the migration succeeded, update the schema version on-disk.
+        self.store_schema_version(txn)?;
+        Ok(())
+    }
+}
--- a/validator_client/src/cli.rs
+++ b/validator_client/src/cli.rs
@@ -1,4 +1,3 @@
-use crate::config::DEFAULT_BEACON_NODE;
 use clap::{App, Arg};

 pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
@@ -22,8 +21,9 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
            Arg::with_name("beacon-nodes")
                .long("beacon-nodes")
                .value_name("NETWORK_ADDRESSES")
-                .help("Comma-separated addresses to one or more beacon node HTTP APIs")
-                .default_value(&DEFAULT_BEACON_NODE)
+                .help("Comma-separated addresses to one or more beacon node HTTP APIs. \
+                       Default is http://localhost:5052."
+                )
                .takes_value(true),
        )
        // This argument is deprecated, use `--beacon-nodes` instead.
Author	SHA1	Message	Date
Paul Hauner	f183af20e3	Version v1.0.6 (#2126 ) ## Issue Addressed NA ## Proposed Changes - Bump versions - Run `cargo update` ## Additional Info NA	2020-12-28 23:38:02 +00:00
Pawan Dhananjay	32a60578fe	Remove default beacon node value from clap (#2121 ) ## Issue Addressed Fixes #2118 ## Proposed Changes Removes the default value in clap for `--beacon-nodes`. This was causing issues with cli picking `--beacon-nodes` default even when not specified and overriding `--beacon-node`. Seems like it was more evident with docker setups because it doesn't use the default `http://localhost:5052` option. Edit: we already set the default to `http://localhost:5052` here so this shouldn't break any existing setups. `9ed65a64f8/validator_client/src/config.rs (L58)` ## Additional info Tested this with docker-compose and binaries. Works as expected in both cases.	2020-12-28 08:23:59 +00:00
Michael Sproul	43ac3f7209	Fix slasher database schema migration to v2 (#2125 ) ## Issue Addressed Closes #2119 ## Proposed Changes Update the slasher schema version to v2 for the breaking changes to the config introduced in #2079. Implement a migration from v1 to v2 so that users can seamlessly upgrade from any version of Lighthouse <=1.0.5. Users who deleted their database for v1.0.5 can upgrade to a release including this patch without any manual intervention. Similarly, any users still on v1.0.4 or earlier can now upgrade without having to drop their database.	2020-12-28 05:09:19 +00:00
Akihito Nakano	78d17c3255	Tweak error messages for ease of investigation (#2122 ) ## Proposed Changes <!-- Please list or describe the changes introduced by this PR. --> Tweaked the error message for ease of investigation as `Failed to update eth1 cache` is used in multiple places. 😃	2020-12-28 01:25:33 +00:00