[Merged by Bors] - Update to spec v1.0.0-rc.0 and BLSv4

Makefile

@@ -42,7 +42,7 @@ endif
 # optimized CPU functions that may not be available on some systems. This
 # results in a more portable binary with ~20% slower BLS verification.
 build-x86_64:
-	cross build --release --manifest-path lighthouse/Cargo.toml --target x86_64-unknown-linux-gnu
+	cross build --release --manifest-path lighthouse/Cargo.toml --target x86_64-unknown-linux-gnu --features modern
 build-x86_64-portable:
 	cross build --release --manifest-path lighthouse/Cargo.toml --target x86_64-unknown-linux-gnu --features portable
 build-aarch64:

account_manager/src/validator/slashing_protection.rs

@@ -5,7 +5,7 @@ use slashing_protection::{
 };
 use std::fs::File;
 use std::path::PathBuf;
-use types::EthSpec;
+use types::{BeaconState, EthSpec};
 
 pub const CMD: &str = "slashing-protection";
 pub const IMPORT_CMD: &str = "import";
@@ -46,18 +46,18 @@ pub fn cli_run<T: EthSpec>(
 ) -> Result<(), String> {
     let slashing_protection_db_path = validator_base_dir.join(SLASHING_PROTECTION_FILENAME);
 
-    let genesis_validators_root = env
+    let testnet_config = env
         .testnet
-        .and_then(|testnet_config| {
-            Some(
-                testnet_config
-                    .genesis_state
-                    .as_ref()?
-                    .genesis_validators_root,
+        .ok_or_else(|| "Unable to get testnet configuration from the environment".to_string())?;
+
+    let genesis_validators_root = testnet_config
+        .beacon_state::<T>()
+        .map(|state: BeaconState<T>| state.genesis_validators_root)
+        .map_err(|e| {
+            format!(
+                "Unable to get genesis state, has genesis occurred? Detail: {:?}",
+                e
             )
-        })
-        .ok_or_else(|| {
-            "Unable to get genesis validators root from testnet config, has genesis occurred?"
         })?;
 
     match matches.subcommand() {

beacon_node/client/src/config.rs

@@ -5,9 +5,6 @@ use std::fs;
 use std::path::PathBuf;
 use types::Graffiti;
 
-/// The number initial validators when starting the `Minimal`.
-const TESTNET_SPEC_CONSTANTS: &str = "minimal";
-
 /// Default directory name for the freezer database under the top-level data dir.
 const DEFAULT_FREEZER_DB_DIR: &str = "freezer_db";
 
@@ -46,7 +43,6 @@ pub struct Config {
     /// Path where the freezer database will be located.
     pub freezer_db_path: Option<PathBuf>,
     pub log_file: PathBuf,
-    pub spec_constants: String,
     /// If true, the node will use co-ordinated junk for eth1 values.
     ///
     /// This is the method used for the 2019 client interop in Canada.
@@ -81,7 +77,6 @@ impl Default for Config {
             network: NetworkConfig::default(),
             chain: <_>::default(),
             websocket_server: <_>::default(),
-            spec_constants: TESTNET_SPEC_CONSTANTS.into(),
             dummy_eth1_backend: false,
             sync_eth1_chain: false,
             eth1: <_>::default(),