merge queue: embarking unstable (2662dc7) and [#6724 + #6678 + #6631 + #6553] together

.github/workflows/test-suite.yml

@@ -428,6 +428,21 @@ jobs:
         cache-target: release
     - name: Run Makefile to trigger the bash script
       run: make cli-local
+  cargo-sort:
+    name: cargo-sort
+    needs: [check-labels]
+    if: needs.check-labels.outputs.skip_ci != 'true'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Get latest version of stable Rust
+      uses: moonrepo/setup-rust@v1
+      with:
+        channel: stable
+        cache-target: release
+        bins: cargo-sort
+    - name: Run cargo sort to check if Cargo.toml files are sorted
+      run: cargo sort --check --workspace
   # This job succeeds ONLY IF all others succeed. It is used by the merge queue to determine whether
   # a PR is safe to merge. New jobs should be added here.
   test-suite-success:
@@ -455,6 +470,7 @@ jobs:
       'compile-with-beta-compiler',
       'cli-check',
       'lockbud',
+      'cargo-sort',
     ]
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -8,11 +8,11 @@ members = [
     "beacon_node/builder_client",
     "beacon_node/client",
     "beacon_node/eth1",
-    "beacon_node/lighthouse_network",
-    "beacon_node/lighthouse_network/gossipsub",
     "beacon_node/execution_layer",
     "beacon_node/http_api",
     "beacon_node/http_metrics",
+    "beacon_node/lighthouse_network",
+    "beacon_node/lighthouse_network/gossipsub",
     "beacon_node/network",
     "beacon_node/store",
     "beacon_node/timer",
@@ -30,40 +30,40 @@ members = [
     "common/eth2_interop_keypairs",
     "common/eth2_network_config",
     "common/eth2_wallet_manager",
-    "common/metrics",
     "common/lighthouse_version",
     "common/lockfile",
     "common/logging",
     "common/lru_cache",
     "common/malloc_utils",
+    "common/metrics",
+    "common/monitoring_api",
     "common/oneshot_broadcast",
     "common/pretty_reqwest_error",
     "common/sensitive_url",
     "common/slot_clock",
     "common/system_health",
-    "common/task_executor",
     "common/target_check",
+    "common/task_executor",
     "common/test_random_derive",
     "common/unused_port",
     "common/validator_dir",
     "common/warp_utils",
-    "common/monitoring_api",
-
-    "database_manager",
-
-    "consensus/int_to_bytes",
     "consensus/fixed_bytes",
     "consensus/fork_choice",
+
+    "consensus/int_to_bytes",
     "consensus/proto_array",
     "consensus/safe_arith",
     "consensus/state_processing",
     "consensus/swap_or_not_shuffle",
 
     "crypto/bls",
-    "crypto/kzg",
     "crypto/eth2_key_derivation",
     "crypto/eth2_keystore",
     "crypto/eth2_wallet",
+    "crypto/kzg",
+
+    "database_manager",
 
     "lcli",
 
@@ -78,8 +78,8 @@ members = [
     "testing/execution_engine_integration",
     "testing/node_test_rig",
     "testing/simulator",
-    "testing/test-test_logger",
     "testing/state_transition_vectors",
+    "testing/test-test_logger",
     "testing/web3signer_tests",
 
     "validator_client",
@@ -126,8 +126,8 @@ delay_map = "0.4"
 derivative = "2"
 dirs = "3"
 either = "1.9"
- # TODO: rust_eth_kzg is pinned for now while a perf regression is investigated
- # The crate_crypto_* dependencies can be removed from this file completely once we update
+# TODO: rust_eth_kzg is pinned for now while a perf regression is investigated
+# The crate_crypto_* dependencies can be removed from this file completely once we update
 rust_eth_kzg = "=0.5.1"
 crate_crypto_internal_eth_kzg_bls12_381 = "=0.5.1"
 crate_crypto_internal_eth_kzg_erasure_codes = "=0.5.1"
@@ -167,7 +167,13 @@ r2d2 = "0.8"
 rand = "0.8"
 rayon = "1.7"
 regex = "1"
-reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls", "native-tls-vendored"] }
+reqwest = { version = "0.11", default-features = false, features = [
+    "blocking",
+    "json",
+    "stream",
+    "rustls-tls",
+    "native-tls-vendored",
+] }
 ring = "0.16"
 rpds = "0.11"
 rusqlite = { version = "0.28", features = ["bundled"] }
@@ -176,7 +182,11 @@ serde_json = "1"
 serde_repr = "0.1"
 serde_yaml = "0.9"
 sha2 = "0.9"
-slog = { version = "2", features = ["max_level_debug", "release_max_level_debug", "nested-values"] }
+slog = { version = "2", features = [
+    "max_level_debug",
+    "release_max_level_debug",
+    "nested-values",
+] }
 slog-async = "2"
 slog-term = "2"
 sloggers = { version = "2", features = ["json"] }
@@ -188,7 +198,12 @@ superstruct = "0.8"
 syn = "1"
 sysinfo = "0.26"
 tempfile = "3"
-tokio = { version = "1", features = ["rt-multi-thread", "sync", "signal", "macros"] }
+tokio = { version = "1", features = [
+    "rt-multi-thread",
+    "sync",
+    "signal",
+    "macros",
+] }
 tokio-stream = { version = "0.1", features = ["sync"] }
 tokio-util = { version = "0.7", features = ["codec", "compat", "time"] }
 tracing = "0.1.40"
@@ -267,7 +282,7 @@ validator_dir = { path = "common/validator_dir" }
 validator_http_api = { path = "validator_client/http_api" }
 validator_http_metrics = { path = "validator_client/http_metrics" }
 validator_metrics = { path = "validator_client/validator_metrics" }
-validator_store= { path = "validator_client/validator_store" }
+validator_store = { path = "validator_client/validator_store" }
 warp_utils = { path = "common/warp_utils" }
 xdelta3 = { git = "http://github.com/sigp/xdelta3-rs", rev = "50d63cdf1878e5cf3538e9aae5eed34a22c64e4a" }
 zstd = "0.13"

account_manager/Cargo.toml

@@ -8,25 +8,25 @@ authors = [
 edition = { workspace = true }
 
 [dependencies]
+account_utils = { workspace = true }
 bls = { workspace = true }
 clap = { workspace = true }
-types = { workspace = true }
-environment = { workspace = true }
-eth2_network_config = { workspace = true }
 clap_utils = { workspace = true }
 directory = { workspace = true }
+environment = { workspace = true }
+eth2 = { workspace = true }
+eth2_keystore = { workspace = true }
+eth2_network_config = { workspace = true }
 eth2_wallet = { workspace = true }
 eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
-validator_dir = { workspace = true }
-tokio = { workspace = true }
-eth2_keystore = { workspace = true }
-account_utils = { workspace = true }
-slashing_protection = { workspace = true }
-eth2 = { workspace = true }
-safe_arith = { workspace = true }
-slot_clock = { workspace = true }
 filesystem = { workspace = true }
+safe_arith = { workspace = true }
 sensitive_url = { workspace = true }
+slashing_protection = { workspace = true }
+slot_clock = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }
+validator_dir = { workspace = true }
 zeroize = { workspace = true }
 
 [dev-dependencies]

beacon_node/Cargo.toml

@@ -20,28 +20,28 @@ write_ssz_files = [
 ] # Writes debugging .ssz files to /tmp during block processing.
 
 [dependencies]
-eth2_config = { workspace = true }
+account_utils = { workspace = true }
 beacon_chain = { workspace = true }
-types = { workspace = true }
-store = { workspace = true }
-client = { path = "client" }
 clap = { workspace = true }
-slog = { workspace = true }
-dirs = { workspace = true }
+clap_utils = { workspace = true }
+client = { path = "client" }
 directory = { workspace = true }
+dirs = { workspace = true }
 environment = { workspace = true }
-task_executor = { workspace = true }
-genesis = { workspace = true }
+eth2_config = { workspace = true }
 execution_layer = { workspace = true }
-lighthouse_network = { workspace = true }
-serde_json = { workspace = true }
-clap_utils = { workspace = true }
-hyper = { workspace = true }
+genesis = { workspace = true }
 hex = { workspace = true }
-slasher = { workspace = true }
+http_api = { workspace = true }
+hyper = { workspace = true }
+lighthouse_network = { workspace = true }
 monitoring_api = { workspace = true }
 sensitive_url = { workspace = true }
-http_api = { workspace = true }
-unused_port = { workspace = true }
+serde_json = { workspace = true }
+slasher = { workspace = true }
+slog = { workspace = true }
+store = { workspace = true }
 strum = { workspace = true }
-account_utils = { workspace = true }
+task_executor = { workspace = true }
+types = { workspace = true }
+unused_port = { workspace = true }

beacon_node/beacon_chain/Cargo.toml

@@ -18,9 +18,9 @@ portable = ["bls/supranational-portable"]
 test_backfill = []
 
 [dev-dependencies]
+criterion = { workspace = true }
 maplit = { workspace = true }
 serde_json = { workspace = true }
-criterion = { workspace = true }
 
 [dependencies]
 alloy-primitives = { workspace = true }
@@ -42,11 +42,11 @@ hex = { workspace = true }
 int_to_bytes = { workspace = true }
 itertools = { workspace = true }
 kzg = { workspace = true }
-metrics = { workspace = true }
 lighthouse_version = { workspace = true }
 logging = { workspace = true }
 lru = { workspace = true }
 merkle_proof = { workspace = true }
+metrics = { workspace = true }
 oneshot_broadcast = { path = "../../common/oneshot_broadcast/" }
 operation_pool = { workspace = true }
 parking_lot = { workspace = true }

beacon_node/beacon_chain/src/execution_payload.rs

@@ -7,7 +7,6 @@
 //! So, this module contains functions that one might expect to find in other crates, but they live
 //! here for good reason.
 
-use crate::otb_verification_service::OptimisticTransitionBlock;
 use crate::{
     BeaconChain, BeaconChainError, BeaconChainTypes, BlockError, BlockProductionError,
     ExecutionPayloadError,
@@ -284,9 +283,6 @@ pub async fn validate_merge_block<'a, T: BeaconChainTypes>(
                     "block_hash" => ?execution_payload.parent_hash(),
                     "msg" => "the terminal block/parent was unavailable"
                 );
-                // Store Optimistic Transition Block in Database for later Verification
-                OptimisticTransitionBlock::from_block(block)
-                    .persist_in_store::<T, _>(&chain.store)?;
                 Ok(())
             } else {
                 Err(ExecutionPayloadError::UnverifiedNonOptimisticCandidate.into())

beacon_node/beacon_chain/src/lib.rs

@@ -47,7 +47,6 @@ pub mod observed_block_producers;
 pub mod observed_data_sidecars;
 pub mod observed_operations;
 mod observed_slashable;
-pub mod otb_verification_service;
 mod persisted_beacon_chain;
 mod persisted_fork_choice;
 mod pre_finalization_cache;