Merge branch 'unstable' into max-blobs-preset

Cargo.toml

@@ -52,6 +52,7 @@ members = [
     "database_manager",
 
     "consensus/int_to_bytes",
+    "consensus/fixed_bytes",
     "consensus/fork_choice",
     "consensus/proto_array",
     "consensus/safe_arith",
@@ -94,9 +95,9 @@ resolver = "2"
 edition = "2021"
 
 [workspace.dependencies]
-alloy-primitives = "0.7.7"
+alloy-primitives = "0.8"
 alloy-rlp = "0.3.4"
-alloy-consensus = "0.2.0"
+alloy-consensus = "0.3.0"
 anyhow = "1"
 arbitrary = { version = "1", features = ["derive"] }
 async-channel = "1.9.0"
@@ -118,11 +119,10 @@ rust_eth_kzg = "0.5.1"
 discv5 = { version = "0.4.1", features = ["libp2p"] }
 env_logger = "0.9"
 error-chain = "0.12"
-ethereum-types = "0.14"
-ethereum_hashing = "0.6.0"
-ethereum_serde_utils = "0.5.2"
-ethereum_ssz = "0.5"
-ethereum_ssz_derive = "0.5"
+ethereum_hashing = "0.7.0"
+ethereum_serde_utils = "0.7"
+ethereum_ssz = "0.7"
+ethereum_ssz_derive = "0.7"
 ethers-core = "1"
 ethers-providers = { version = "1", default-features = false }
 exit-future = "0.2"
@@ -137,7 +137,7 @@ libsecp256k1 = "0.7"
 log = "0.4"
 lru = "0.12"
 maplit = "1"
-milhouse = "0.1"
+milhouse = "0.3"
 num_cpus = "1"
 parking_lot = "0.12"
 paste = "1"
@@ -163,7 +163,7 @@ slog-term = "2"
 sloggers = { version = "2", features = ["json"] }
 smallvec = { version = "1.11.2", features = ["arbitrary"] }
 snap = "1"
-ssz_types = "0.6"
+ssz_types = "0.8"
 strum = { version = "0.24", features = ["derive"] }
 superstruct = "0.8"
 syn = "1"
@@ -177,8 +177,8 @@ tracing-appender = "0.2"
 tracing-core = "0.1"
 tracing-log = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tree_hash = "0.6"
-tree_hash_derive = "0.6"
+tree_hash = "0.8"
+tree_hash_derive = "0.8"
 url = "2"
 uuid = { version = "0.8", features = ["serde", "v4"] }
 warp = { version = "0.3.7", default-features = false, features = ["tls"] }
@@ -205,6 +205,7 @@ eth2_keystore = { path = "crypto/eth2_keystore" }
 eth2_network_config = { path = "common/eth2_network_config" }
 eth2_wallet = { path = "crypto/eth2_wallet" }
 execution_layer = { path = "beacon_node/execution_layer" }
+fixed_bytes = { path = "consensus/fixed_bytes" }
 filesystem = { path = "common/filesystem" }
 fork_choice = { path = "consensus/fork_choice" }
 genesis = { path = "beacon_node/genesis" }
@@ -240,11 +241,11 @@ validator_client = { path = "validator_client" }
 validator_dir = { path = "common/validator_dir" }
 warp_utils = { path = "common/warp_utils" }
 
-[patch.crates-io]
-quick-protobuf = { git = "https://github.com/sigp/quick-protobuf.git", rev = "681f413312404ab6e51f0b46f39b0075c6f4ebfd" }
-
 [profile.maxperf]
 inherits = "release"
 lto = "fat"
 codegen-units = 1
 incremental = false
+
+[patch.crates-io]
+quick-protobuf = { git = "https://github.com/sigp/quick-protobuf.git", rev = "681f413312404ab6e51f0b46f39b0075c6f4ebfd" }

beacon_node/beacon_chain/Cargo.toml

@@ -23,6 +23,7 @@ serde_json = { workspace = true }
 criterion = { workspace = true }
 
 [dependencies]
+alloy-primitives = { workspace = true }
 bitvec = { workspace = true }
 bls = { workspace = true }
 derivative = { workspace = true }

beacon_node/beacon_chain/src/attester_cache.rs

@@ -19,8 +19,8 @@ use types::{
     beacon_state::{
         compute_committee_index_in_epoch, compute_committee_range_in_epoch, epoch_committee_count,
     },
-    BeaconState, BeaconStateError, ChainSpec, Checkpoint, Epoch, EthSpec, Hash256, RelativeEpoch,
-    Slot,
+    BeaconState, BeaconStateError, ChainSpec, Checkpoint, Epoch, EthSpec, FixedBytesExtended,
+    Hash256, RelativeEpoch, Slot,
 };
 
 type JustifiedCheckpoint = Checkpoint;

beacon_node/beacon_chain/src/beacon_block_streamer.rs

@@ -715,7 +715,9 @@ mod tests {
     use std::sync::LazyLock;
     use std::time::Duration;
     use tokio::sync::mpsc;
-    use types::{ChainSpec, Epoch, EthSpec, Hash256, Keypair, MinimalEthSpec, Slot};
+    use types::{
+        ChainSpec, Epoch, EthSpec, FixedBytesExtended, Hash256, Keypair, MinimalEthSpec, Slot,
+    };
 
     const VALIDATOR_COUNT: usize = 48;