Kintsugi 🍵

Cargo.toml

@@ -7,6 +7,7 @@ members = [
     "beacon_node/client",
     "beacon_node/eth1",
     "beacon_node/lighthouse_network",
+    "beacon_node/execution_layer",
     "beacon_node/http_api",
     "beacon_node/http_metrics",
     "beacon_node/network",
@@ -87,3 +88,7 @@ members = [
 [patch.crates-io]
 fixed-hash = { git = "https://github.com/paritytech/parity-common", rev="df638ab0885293d21d656dc300d39236b69ce57d" }
 warp = { git = "https://github.com/macladson/warp", rev ="7e75acc" }
+eth2_ssz = { path = "consensus/ssz" }
+eth2_ssz_types = { path = "consensus/ssz_types" }
+tree_hash = { path = "consensus/tree_hash" }
+eth2_serde_utils = { path = "consensus/serde_utils" }

account_manager/src/validator/exit.rs

@@ -84,8 +84,8 @@ pub fn cli_run<E: EthSpec>(matches: &ArgMatches, env: Environment<E>) -> Result<
         Timeouts::set_all(Duration::from_secs(env.eth2_config.spec.seconds_per_slot)),
     );
 
-    let testnet_config = env
-        .testnet
+    let eth2_network_config = env
+        .eth2_network_config
         .clone()
         .expect("network should have a valid config");
 
@@ -95,7 +95,7 @@ pub fn cli_run<E: EthSpec>(matches: &ArgMatches, env: Environment<E>) -> Result<
         &client,
         &spec,
         stdin_inputs,
-        &testnet_config,
+        &eth2_network_config,
         no_wait,
     ))?;
 
@@ -109,11 +109,11 @@ async fn publish_voluntary_exit<E: EthSpec>(
     client: &BeaconNodeHttpClient,
     spec: &ChainSpec,
     stdin_inputs: bool,
-    testnet_config: &Eth2NetworkConfig,
+    eth2_network_config: &Eth2NetworkConfig,
     no_wait: bool,
 ) -> Result<(), String> {
     let genesis_data = get_geneisis_data(client).await?;
-    let testnet_genesis_root = testnet_config
+    let testnet_genesis_root = eth2_network_config
         .beacon_state::<E>()
         .as_ref()
         .expect("network should have valid genesis state")

account_manager/src/validator/slashing_protection.rs

@@ -82,11 +82,11 @@ pub fn cli_run<T: EthSpec>(
 ) -> Result<(), String> {
     let slashing_protection_db_path = validator_base_dir.join(SLASHING_PROTECTION_FILENAME);
 
-    let testnet_config = env
-        .testnet
+    let eth2_network_config = env
+        .eth2_network_config
         .ok_or("Unable to get testnet configuration from the environment")?;
 
-    let genesis_validators_root = testnet_config
+    let genesis_validators_root = eth2_network_config
         .beacon_state::<T>()
         .map(|state: BeaconState<T>| state.genesis_validators_root())
         .map_err(|e| {

beacon_node/beacon_chain/Cargo.toml

@@ -3,6 +3,7 @@ name = "beacon_chain"
 version = "0.2.0"
 authors = ["Paul Hauner <[email protected]>", "Age Manning <[email protected]>"]
 edition = "2018"
+autotests = false # using a single test binary compiles faster
 
 [features]
 default = ["participation_metrics"]
@@ -29,11 +30,11 @@ slog = { version = "2.5.2", features = ["max_level_trace"] }
 sloggers = { version = "2.1.1", features = ["json"] }
 slot_clock = { path = "../../common/slot_clock" }
 eth2_hashing = "0.2.0"
-eth2_ssz = "0.4.0"
-eth2_ssz_types = "0.2.1"
+eth2_ssz = "0.4.1"
+eth2_ssz_types = "0.2.2"
 eth2_ssz_derive = "0.3.0"
 state_processing = { path = "../../consensus/state_processing" }
-tree_hash = "0.4.0"
+tree_hash = "0.4.1"
 types = { path = "../../consensus/types" }
 tokio = "1.14.0"
 eth1 = { path = "../eth1" }
@@ -55,3 +56,9 @@ slasher = { path = "../../slasher" }
 eth2 = { path = "../../common/eth2" }
 strum = { version = "0.21.0", features = ["derive"] }
 logging = { path = "../../common/logging" }
+execution_layer = { path = "../execution_layer" }
+sensitive_url = { path = "../../common/sensitive_url" }
+
+[[test]]
+name = "beacon_chain_tests"
+path = "tests/main.rs"