From e022b6fd92a33cd44e3ae51ee2fc2ecc0f773222 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Thu, 5 Dec 2024 11:51:26 +0100 Subject: [PATCH] chore: bump alloy 073 (#13150) --- Cargo.lock | 113 +++++++++--------- Cargo.toml | 56 ++++----- crates/net/downloaders/src/bodies/bodies.rs | 2 +- crates/net/downloaders/src/bodies/request.rs | 1 + .../net/downloaders/src/bodies/test_utils.rs | 1 + crates/primitives-traits/src/block/header.rs | 8 +- crates/stages/stages/src/stages/bodies.rs | 32 ++--- 7 files changed, 102 insertions(+), 111 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 306e6a992..ce20350b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73dd0ab7003dfa3efd252e423873cd3bc241d1456147e752f995cc8aabd1d1f6" +checksum = "a101d4d016f47f13890a74290fdd17b05dd175191d9337bc600791fb96e4dea8" dependencies = [ "alloy-eips", "alloy-primitives", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a01f5593f6878452c6dde102ece391b60cba79801c5f606f8fe898ff57cd5d7" +checksum = "2869e4fb31331d3b8c58c7db567d1e4e4e94ef64640beda3b6dd9b7045690941" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -222,9 +222,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c242de43a1869bcb2fbce3b377130959d10dfd562b87ac7aa2f04d98baac51" +checksum = "8b6755b093afef5925f25079dd5a7c8d096398b804ba60cb5275397b06b31689" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -243,12 +243,13 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd39b72f860cb0c542fac925f91d1939c2b14a0970b39d0ae304b5b7574a0ac" +checksum = "aeec8e6eab6e52b7c9f918748c9b811e87dbef7312a2e3a2ca1729a92966a6af" dependencies = [ "alloy-primitives", "alloy-serde", + "alloy-trie", "serde", ] @@ -266,9 +267,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c15c11661571a19a06896663c93e804ccf013159275a89a98e892014df514d8" +checksum = "4fa077efe0b834bcd89ff4ba547f48fb081e4fdc3673dd7da1b295a2cf2bb7b7" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -280,9 +281,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60dd0b99eaa5e715dd90d42021f7f08a0a70976ea84f41a0ad233770e0c1962b" +checksum = "209a1882a08e21aca4aac6e2a674dc6fcf614058ef8cb02947d63782b1899552" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -318,9 +319,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a04cf8f3a19b024b2bc71b5774d423cd2edda7f67df6029daa1368c5c02da5" +checksum = "bffcf33dd319f21cd6f066d81cbdef0326d4bdaaf7cfe91110bc090707858e9f" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -367,9 +368,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4933c761f10e44d5e901804b56efb2ce6e0945e6c57d2fa1e5ace303fae6f74a" +checksum = "9eefa6f4c798ad01f9b4202d02cea75f5ec11fa180502f4701e2b47965a8c0bb" dependencies = [ "alloy-chains", "alloy-consensus", @@ -408,9 +409,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808719714bfb2aa24b0eb2a38411ce8e654ba11c0ebf2a6648fcbe9fabfe696d" +checksum = "aac9a7210e0812b1d814118f426f57eb7fc260a419224dd1c76d169879c06907" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -449,9 +450,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce26c25efb8290b6ba559ae6c40bf6630d337e107ae242e5790501420dba7b7" +checksum = "ed30bf1041e84cabc5900f52978ca345dd9969f2194a945e6fdec25b0620705c" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -474,9 +475,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41080ce2640928f0df45c41d2af629b88db3cb31af3abbe614964ae10001ddac" +checksum = "5ab686b0fa475d2a4f5916c5f07797734a691ec58e44f0f55d4746ea39cbcefb" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -487,9 +488,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db981579da4d597d9d35f56ad7641b929bf8f551ab696715132f554863c83540" +checksum = "1f0874a976ccdf83a178ad93b64bec5b8c91a47428d714d544ca70258acfa07b" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -499,9 +500,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252b7433e731e5d24f7eb7a54a368bc813a1086aaf84643ab10e99599a6ff16c" +checksum = "d33bc190844626c08e21897736dbd7956ab323c09e6f141b118d1c8b7aff689e" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -522,9 +523,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c8db5fb70d2fece7bc1cd5adf42e72fc8a23547adeff8f558d9063f1e7788c" +checksum = "cc37861dc8cbf5da35d346139fbe6e03ee7823cc21138a2c4a590d3b0b4b24be" dependencies = [ "alloy-eips", "alloy-primitives", @@ -537,9 +538,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3a662ced0bfbe582d26ed85d6a0092310787331555c8f7a86f843c7ca272ef" +checksum = "f0294b553785eb3fa7fff2e8aec45e82817258e7e6c9365c034a90cb6baeebc9" dependencies = [ "alloy-primitives", "serde", @@ -547,9 +548,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b000c7f3469e7faa575ba70207294cf07e91dfd6ce4d04d5d5d8069f974a66" +checksum = "5d297268357e3eae834ddd6888b15f764cbc0f4b3be9265f5f6ec239013f3d68" dependencies = [ "alloy-consensus", "alloy-eips", @@ -568,9 +569,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3468e7385fbb86b0fde5497d685c02f765ea09d36f7e07c5d1c9a52b077d38e2" +checksum = "a0600b8b5e2dc0cab12cbf91b5a885c35871789fb7b3a57b434bd4fced5b7a8b" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -590,9 +591,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26988fb56d87414c96b8fd9b69ad6ce3768bc9acc953ed02c18a66f74ab98c66" +checksum = "093d618d5a42808e7ae26062f415a1e816fc27d3d32662c6ed52d0871b154894" dependencies = [ "alloy-eips", "alloy-primitives", @@ -604,9 +605,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a90be1bc8e3659db1c9512191873a268a917efbc62b8bd39a92c12bf613b193" +checksum = "4e073ab0e67429c60be281e181731132fd07d82e091c10c29ace6935101034bb" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -618,9 +619,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beade2858d292442f5be6fce452c923072a7ac4d3898d333abf42703945444d0" +checksum = "7435f6bfb93912f16d64bb61f4278fa698469e054784f477337ef87ec0b2527b" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -630,9 +631,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42de6002e2154b50b3568aea27e26bd9caf7b754658f43065f2e9b6ee0a8c839" +checksum = "9afa753a97002a33b2ccb707d9f15f31c81b8c1b786c95b73cc62bb1d1fd0c3f" dependencies = [ "alloy-primitives", "arbitrary", @@ -642,9 +643,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288a9a25e2578dab17845fd8d2be1d32de33565783ed185ded161a65f92381b" +checksum = "9b2cbff01a673936c2efd7e00d4c0e9a4dbbd6d600e2ce298078d33efbb19cd7" dependencies = [ "alloy-primitives", "async-trait", @@ -656,9 +657,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8081f589ddc11a959605e30c723d51cad2562d9072305f8e3ef311f077e5eb" +checksum = "bd6d988cb6cd7d2f428a74476515b1a6e901e08c796767f9f93311ab74005c8b" dependencies = [ "alloy-consensus", "alloy-network", @@ -744,9 +745,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90352f4cf78017905c3244f48b38fadc345970bbc9095087c0f985a580550488" +checksum = "d69d36982b9e46075ae6b792b0f84208c6c2c15ad49f6c500304616ef67b70e0" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -764,9 +765,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d26c94d51fa8b1aee3d15db113dd0773776c02bb36dbaa2590b900dadd7e7d0" +checksum = "2e02ffd5d93ffc51d72786e607c97de3b60736ca3e636ead0ec1f7dce68ea3fd" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -779,9 +780,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c498fcdec50650be6b6a22ce7928a1b2738086b4f94f31b132e83498d45bbb" +checksum = "1b6f8b87cb84bae6d81ae6604b37741c8116f84f9784a0ecc6038c302e679d23" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -798,9 +799,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7b21335b55c9f715e2acca0228dc1d6880d961756916c13a9ce70f9f413e70" +checksum = "9c085c4e1e7680b723ffc558f61a22c061ed3f70eb3436f93f3936779c59cec1" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -816,9 +817,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b2e366c0debf0af77766c23694a3f863b02633050e71e096e257ffbd395e50" +checksum = "3a5fd8fea044cc9a8c8a50bb6f28e31f0385d820f116c5b98f6f4e55d6e5590b" dependencies = [ "alloy-primitives", "alloy-rlp", diff --git a/Cargo.toml b/Cargo.toml index f9fc6f2ca..4233750d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -434,40 +434,40 @@ alloy-rlp = { version = "0.3.4", default-features = false } alloy-sol-types = "0.8.11" alloy-trie = { version = "0.7", default-features = false } -alloy-consensus = { version = "0.7.2", default-features = false } -alloy-contract = { version = "0.7.2", default-features = false } -alloy-eips = { version = "0.7.2", default-features = false } -alloy-genesis = { version = "0.7.2", default-features = false } -alloy-json-rpc = { version = "0.7.2", default-features = false } -alloy-network = { version = "0.7.2", default-features = false } -alloy-network-primitives = { version = "0.7.2", default-features = false } -alloy-node-bindings = { version = "0.7.2", default-features = false } -alloy-provider = { version = "0.7.2", features = [ +alloy-consensus = { version = "0.7.3", default-features = false } +alloy-contract = { version = "0.7.3", default-features = false } +alloy-eips = { version = "0.7.3", default-features = false } +alloy-genesis = { version = "0.7.3", default-features = false } +alloy-json-rpc = { version = "0.7.3", default-features = false } +alloy-network = { version = "0.7.3", default-features = false } +alloy-network-primitives = { version = "0.7.3", default-features = false } +alloy-node-bindings = { version = "0.7.3", default-features = false } +alloy-provider = { version = "0.7.3", features = [ "reqwest", ], default-features = false } -alloy-pubsub = { version = "0.7.2", default-features = false } -alloy-rpc-client = { version = "0.7.2", default-features = false } -alloy-rpc-types = { version = "0.7.2", features = [ +alloy-pubsub = { version = "0.7.3", default-features = false } +alloy-rpc-client = { version = "0.7.3", default-features = false } +alloy-rpc-types = { version = "0.7.3", features = [ "eth", ], default-features = false } -alloy-rpc-types-admin = { version = "0.7.2", default-features = false } -alloy-rpc-types-anvil = { version = "0.7.2", default-features = false } -alloy-rpc-types-beacon = { version = "0.7.2", default-features = false } -alloy-rpc-types-debug = { version = "0.7.2", default-features = false } -alloy-rpc-types-engine = { version = "0.7.2", default-features = false } -alloy-rpc-types-eth = { version = "0.7.2", default-features = false } -alloy-rpc-types-mev = { version = "0.7.2", default-features = false } -alloy-rpc-types-trace = { version = "0.7.2", default-features = false } -alloy-rpc-types-txpool = { version = "0.7.2", default-features = false } -alloy-serde = { version = "0.7.2", default-features = false } -alloy-signer = { version = "0.7.2", default-features = false } -alloy-signer-local = { version = "0.7.2", default-features = false } -alloy-transport = { version = "0.7.2" } -alloy-transport-http = { version = "0.7.2", features = [ +alloy-rpc-types-admin = { version = "0.7.3", default-features = false } +alloy-rpc-types-anvil = { version = "0.7.3", default-features = false } +alloy-rpc-types-beacon = { version = "0.7.3", default-features = false } +alloy-rpc-types-debug = { version = "0.7.3", default-features = false } +alloy-rpc-types-engine = { version = "0.7.3", default-features = false } +alloy-rpc-types-eth = { version = "0.7.3", default-features = false } +alloy-rpc-types-mev = { version = "0.7.3", default-features = false } +alloy-rpc-types-trace = { version = "0.7.3", default-features = false } +alloy-rpc-types-txpool = { version = "0.7.3", default-features = false } +alloy-serde = { version = "0.7.3", default-features = false } +alloy-signer = { version = "0.7.3", default-features = false } +alloy-signer-local = { version = "0.7.3", default-features = false } +alloy-transport = { version = "0.7.3" } +alloy-transport-http = { version = "0.7.3", features = [ "reqwest-rustls-tls", ], default-features = false } -alloy-transport-ipc = { version = "0.7.2", default-features = false } -alloy-transport-ws = { version = "0.7.2", default-features = false } +alloy-transport-ipc = { version = "0.7.3", default-features = false } +alloy-transport-ws = { version = "0.7.3", default-features = false } # op op-alloy-rpc-types = "0.7.3" diff --git a/crates/net/downloaders/src/bodies/bodies.rs b/crates/net/downloaders/src/bodies/bodies.rs index 682995e7e..1ee949299 100644 --- a/crates/net/downloaders/src/bodies/bodies.rs +++ b/crates/net/downloaders/src/bodies/bodies.rs @@ -15,7 +15,7 @@ use reth_network_p2p::{ error::{DownloadError, DownloadResult}, }; use reth_primitives::SealedHeader; -use reth_primitives_traits::{size::InMemorySize, BlockHeader as _}; +use reth_primitives_traits::size::InMemorySize; use reth_storage_api::HeaderProvider; use reth_tasks::{TaskSpawner, TokioTaskExecutor}; use std::{ diff --git a/crates/net/downloaders/src/bodies/request.rs b/crates/net/downloaders/src/bodies/request.rs index 66287624f..40fa9c309 100644 --- a/crates/net/downloaders/src/bodies/request.rs +++ b/crates/net/downloaders/src/bodies/request.rs @@ -1,4 +1,5 @@ use crate::metrics::{BodyDownloaderMetrics, ResponseMetrics}; +use alloy_consensus::BlockHeader; use alloy_primitives::B256; use futures::{Future, FutureExt}; use reth_consensus::Consensus; diff --git a/crates/net/downloaders/src/bodies/test_utils.rs b/crates/net/downloaders/src/bodies/test_utils.rs index af4bf8145..781d1d93b 100644 --- a/crates/net/downloaders/src/bodies/test_utils.rs +++ b/crates/net/downloaders/src/bodies/test_utils.rs @@ -2,6 +2,7 @@ #![allow(dead_code)] +use alloy_consensus::BlockHeader; use alloy_primitives::B256; use reth_db::{tables, DatabaseEnv}; use reth_db_api::{database::Database, transaction::DbTxMut}; diff --git a/crates/primitives-traits/src/block/header.rs b/crates/primitives-traits/src/block/header.rs index 47d50a45b..42d0153b1 100644 --- a/crates/primitives-traits/src/block/header.rs +++ b/crates/primitives-traits/src/block/header.rs @@ -33,12 +33,6 @@ pub trait BlockHeader: + AsRef + 'static { - /// Returns whether this header corresponds to an empty block. - fn is_empty(&self) -> bool; } -impl BlockHeader for alloy_consensus::Header { - fn is_empty(&self) -> bool { - self.is_empty() - } -} +impl BlockHeader for alloy_consensus::Header {} diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index 0f90ff69e..83be3f36f 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -1,17 +1,11 @@ -use std::{ - cmp::Ordering, - task::{ready, Context, Poll}, -}; - +use super::missing_static_data_error; use futures_util::TryStreamExt; use reth_codecs::Compact; -use reth_primitives_traits::{Block, BlockBody}; -use tracing::*; - use reth_db::{tables, transaction::DbTx}; use reth_db_api::{cursor::DbCursorRO, transaction::DbTxMut}; use reth_network_p2p::bodies::{downloader::BodyDownloader, response::BlockResponse}; use reth_primitives::StaticFileSegment; +use reth_primitives_traits::{Block, BlockBody}; use reth_provider::{ providers::StaticFileWriter, BlockReader, BlockWriter, DBProvider, ProviderError, StaticFileProviderFactory, StatsReader, StorageLocation, @@ -21,8 +15,11 @@ use reth_stages_api::{ UnwindInput, UnwindOutput, }; use reth_storage_errors::provider::ProviderResult; - -use super::missing_static_data_error; +use std::{ + cmp::Ordering, + task::{ready, Context, Poll}, +}; +use tracing::*; /// The body stage downloads block bodies. /// @@ -264,17 +261,14 @@ where #[cfg(test)] mod tests { - use assert_matches::assert_matches; - - use reth_provider::StaticFileProviderFactory; - use reth_stages_api::StageUnitCheckpoint; - use test_utils::*; - + use super::*; use crate::test_utils::{ stage_test_suite_ext, ExecuteStageTestRunner, StageTestRunner, UnwindStageTestRunner, }; - - use super::*; + use assert_matches::assert_matches; + use reth_provider::StaticFileProviderFactory; + use reth_stages_api::StageUnitCheckpoint; + use test_utils::*; stage_test_suite_ext!(BodyTestRunner, body); @@ -490,7 +484,7 @@ mod tests { UnwindStageTestRunner, }, }; - use alloy_consensus::Header; + use alloy_consensus::{BlockHeader, Header}; use alloy_primitives::{BlockNumber, TxNumber, B256}; use futures_util::Stream; use reth_db::{static_file::HeaderWithHashMask, tables};