Merge branch 'unstable' of https://github.com/sigp/lighthouse into re…

…alized-unrealized-experimentation

� Conflicts:
�	beacon_node/beacon_chain/src/beacon_chain.rs
�	beacon_node/beacon_chain/src/block_verification.rs
�	beacon_node/beacon_chain/src/canonical_head.rs
�	beacon_node/beacon_chain/src/execution_payload.rs
�	beacon_node/beacon_chain/src/schema_change.rs
�	beacon_node/beacon_chain/src/schema_change/migration_schema_v7.rs
�	beacon_node/beacon_chain/src/test_utils.rs
�	beacon_node/http_api/src/lib.rs
�	beacon_node/http_api/tests/tests.rs
�	beacon_node/network/src/beacon_processor/worker/sync_methods.rs
�	common/task_executor/src/lib.rs
�	common/task_executor/src/metrics.rs
�	consensus/fork_choice/src/fork_choice.rs
�	consensus/fork_choice/tests/tests.rs
�	consensus/types/src/beacon_block.rs
�	consensus/types/src/beacon_block_body.rs
�	consensus/types/src/beacon_state/committee_cache/tests.rs
�	testing/ef_tests/src/cases/fork_choice.rs

Cargo.toml

@@ -4,6 +4,7 @@ members = [
 
     "beacon_node",
     "beacon_node/beacon_chain",
+    "beacon_node/builder_client",
     "beacon_node/client",
     "beacon_node/eth1",
     "beacon_node/lighthouse_network",

Cross.toml

@@ -1,15 +1,5 @@
-[build.env]
-passthrough = [
-    "RUSTFLAGS",
-]
-
-# These custom images are required to work around the lack of Clang in the default `cross` images.
-# We need Clang to run `bindgen` for MDBX, and the `BINDGEN_EXTRA_CLANG_ARGS` flags must also be set
-# while cross-compiling for ARM to prevent bindgen from attempting to include headers from the host.
-#
-# For more information see https://github.com/rust-embedded/cross/pull/608
 [target.x86_64-unknown-linux-gnu]
-image = "michaelsproul/cross-clang:x86_64-latest"
+pre-build = ["apt-get install -y cmake clang-3.9"]
 
 [target.aarch64-unknown-linux-gnu]
-image = "michaelsproul/cross-clang:aarch64-latest"
+pre-build = ["apt-get install -y cmake clang-3.9"]

beacon_node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "beacon_node"
-version = "2.3.1"
+version = "2.3.2-rc.0"
 authors = ["Paul Hauner <[email protected]>", "Age Manning <[email protected]"]
 edition = "2021"