From 1771c568ac28b6d0d1d7a2d0429624b05bc8a3d6 Mon Sep 17 00:00:00 2001 From: Artem Vorotnikov Date: Sat, 3 Sep 2022 03:33:30 +0300 Subject: [PATCH] Update deps (#270) --- Cargo.lock | 150 ++++++++++++++++++++++------------------- Cargo.toml | 1 + bin/akula-sentry.rs | 3 +- bin/akula-toolbox.rs | 3 +- bin/akula.rs | 3 +- bin/consensus-tests.rs | 2 +- src/binutil.rs | 15 +---- 7 files changed, 91 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bbe9a863..a67990b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,7 +71,7 @@ dependencies = [ "chrono", "cidr", "cipher", - "clap 3.2.17", + "clap 3.2.20", "console-subscriber", "criterion", "croaring", @@ -91,6 +91,7 @@ dependencies = [ "ethereum-jsonrpc", "ethereum-types", "ethnum", + "expanded-pathbuf", "fastrlp", "fdlimit", "futures", @@ -164,9 +165,9 @@ dependencies = [ [[package]] name = "android_system_properties" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ "libc", ] @@ -182,9 +183,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.62" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305" +checksum = "a26fa4d7e3f2eebadf743988fc8aec9fa9a9e82611acafd77c1462ed6262440a" [[package]] name = "array-init" @@ -381,7 +382,7 @@ dependencies = [ "bitflags", "cexpr", "clang-sys", - "clap 3.2.17", + "clap 3.2.20", "env_logger", "lazy_static", "lazycell", @@ -622,9 +623,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.17" +version = "3.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" +checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" dependencies = [ "atty", "bitflags", @@ -639,9 +640,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.17" +version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck", "proc-macro-error", @@ -950,13 +951,14 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.3.4" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if", "hashbrown", "lock_api", + "once_cell", "parking_lot_core 0.9.3", ] @@ -1105,9 +1107,9 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.2.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187" +checksum = "45a0ac4aeb3a18f92eaf09c6bb9b3ac30ff61ca95514fc58cbead1c9a6bf5401" dependencies = [ "enum-iterator-derive", ] @@ -1212,7 +1214,7 @@ dependencies = [ [[package]] name = "ethereum-interfaces" version = "0.1.0" -source = "git+https://github.com/ledgerwatch/interfaces#75d924a737312a7c102eb7004910ccbc3d7f1174" +source = "git+https://github.com/ledgerwatch/interfaces#23c237c9b9a8e27ba0a3445f299fed7783d2797d" dependencies = [ "arrayref", "ethereum-types", @@ -1274,6 +1276,17 @@ dependencies = [ "cc", ] +[[package]] +name = "expanded-pathbuf" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd492227aa0be11fd815129c66df89929809a1014717763c3b895eaaafe52a3" +dependencies = [ + "anyhow", + "derive_more", + "shellexpand", +] + [[package]] name = "fastrand" version = "1.8.0" @@ -1382,9 +1395,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa" +checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" dependencies = [ "futures-channel", "futures-core", @@ -1397,9 +1410,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" +checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" dependencies = [ "futures-core", "futures-sink", @@ -1407,15 +1420,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" +checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" [[package]] name = "futures-executor" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528" +checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" dependencies = [ "futures-core", "futures-task", @@ -1435,15 +1448,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" +checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" [[package]] name = "futures-macro" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d" +checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" dependencies = [ "proc-macro2", "quote", @@ -1452,21 +1465,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" +checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" [[package]] name = "futures-task" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" +checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" [[package]] name = "futures-util" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" +checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" dependencies = [ "futures-channel", "futures-core", @@ -1705,9 +1718,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1767,13 +1780,14 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.46" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" +checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" dependencies = [ "android_system_properties", "core-foundation-sys", "js-sys", + "once_cell", "wasm-bindgen", "winapi", ] @@ -2172,9 +2186,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" dependencies = [ "autocfg", "scopeguard", @@ -2452,9 +2466,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" +checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" [[package]] name = "oorandom" @@ -2639,9 +2653,9 @@ dependencies = [ [[package]] name = "pprof" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bba88ee898c63351101af3e60c66c5398c517681ce533eef8caff10ecf11ec1" +checksum = "d6472bfed9475542ac46c518734a8d06d71b0f6cb2c17f904aa301711a57786f" dependencies = [ "backtrace", "cfg-if", @@ -2666,9 +2680,9 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "prettyplease" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697ae720ee02011f439e0701db107ffe2916d83f718342d65d7f8bf7b8a5fee9" +checksum = "a49e86d2c26a24059894a3afa13fd17d063419b05dfb83f06d9c3566060c3f5a" dependencies = [ "proc-macro2", "syn", @@ -3183,7 +3197,7 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.13", + "time 0.3.14", ] [[package]] @@ -3213,9 +3227,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5" dependencies = [ "cfg-if", "cpufeatures", @@ -3224,9 +3238,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a31480366ec990f395a61b7c08122d99bd40544fdb5abcfc1b06bb29994312c" +checksum = "eaedf34ed289ea47c2b741bb72e5357a209512d67bcd4bda44359e5bf0470f56" dependencies = [ "digest 0.10.3", "keccak", @@ -3288,9 +3302,9 @@ checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", "winapi", @@ -3443,9 +3457,9 @@ checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" [[package]] name = "sysinfo" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71eb43e528fdc239f08717ec2a378fdb017dddbc3412de15fff527554591a66c" +checksum = "621609553b14bca49448b3c97e625d7187980cc2a42fd169b4c3b306dcc4a7e9" dependencies = [ "cfg-if", "core-foundation-sys", @@ -3512,18 +3526,18 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "3d0a539a918745651435ac7db7a18761589a94cd7e94cd56999f828bf73c8a57" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "c251e90f708e16c49a16f4917dc2131e75222b72edfa9cb7f7c58ae56aae0c09" dependencies = [ "proc-macro2", "quote", @@ -3552,9 +3566,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db76ff9fa4b1458b3c7f077f3ff9887394058460d21e634355b273aaf11eea45" +checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" dependencies = [ "itoa 1.0.3", "libc", @@ -3598,9 +3612,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42" dependencies = [ "autocfg", "bytes", @@ -4032,9 +4046,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "7.4.0" +version = "7.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffa80ed519f45995741e70664d4abcf147d2a47b8c7ea0a4aa495548ef9474f" +checksum = "73ba753d713ec3844652ad2cb7eb56bc71e34213a14faddac7852a10ba88f61e" dependencies = [ "anyhow", "cfg-if", @@ -4045,7 +4059,7 @@ dependencies = [ "rustversion", "sysinfo", "thiserror", - "time 0.3.13", + "time 0.3.14", ] [[package]] @@ -4162,13 +4176,13 @@ dependencies = [ [[package]] name = "which" -version = "4.2.5" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 66271fb6..15f27f17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,6 +38,7 @@ enr = { version = "0.6", default-features = false, features = [ "rust-secp256k1", ] } enum-primitive-derive = "0.2" +expanded-pathbuf = "0.1" ethash = { git = "https://github.com/rust-ethereum/ethash" } ethereum-forkid = "0.10" ethereum-interfaces = { git = "https://github.com/ledgerwatch/interfaces", features = [ diff --git a/bin/akula-sentry.rs b/bin/akula-sentry.rs index 36b36397..1dd20af7 100644 --- a/bin/akula-sentry.rs +++ b/bin/akula-sentry.rs @@ -1,11 +1,12 @@ #![allow(dead_code, clippy::upper_case_acronyms)] use akula::{ akula_tracing::{self, Component}, - binutil::{AkulaDataDir, ExpandedPathBuf}, + binutil::AkulaDataDir, models::ChainSpec, }; use clap::Parser; use educe::Educe; +use expanded_pathbuf::ExpandedPathBuf; use std::time::Duration; use tokio::time::sleep; use tracing::*; diff --git a/bin/akula-toolbox.rs b/bin/akula-toolbox.rs index 1ed1a877..d984b351 100644 --- a/bin/akula-toolbox.rs +++ b/bin/akula-toolbox.rs @@ -1,6 +1,6 @@ #![feature(never_type)] use akula::{ - binutil::{AkulaDataDir, ExpandedPathBuf}, + binutil::AkulaDataDir, consensus::{engine_factory, Consensus, ForkChoiceMode}, hex_to_bytes, kv::{ @@ -15,6 +15,7 @@ use akula::{ use anyhow::{ensure, format_err, Context}; use bytes::Bytes; use clap::Parser; +use expanded_pathbuf::ExpandedPathBuf; use std::{borrow::Cow, collections::BTreeMap, io::Read, sync::Arc}; use tokio::pin; use tracing::*; diff --git a/bin/akula.rs b/bin/akula.rs index c699cb28..f186faa0 100644 --- a/bin/akula.rs +++ b/bin/akula.rs @@ -1,6 +1,6 @@ use akula::{ akula_tracing::{self, Component}, - binutil::{AkulaDataDir, ExpandedPathBuf}, + binutil::AkulaDataDir, consensus::{engine_factory, Consensus, ForkChoiceMode}, kv::tables::CHAINDATA_TABLES, models::*, @@ -18,6 +18,7 @@ use clap::Parser; use ethereum_jsonrpc::{ ErigonApiServer, EthApiServer, NetApiServer, OtterscanApiServer, TraceApiServer, Web3ApiServer, }; +use expanded_pathbuf::ExpandedPathBuf; use http::Uri; use jsonrpsee::{ core::server::rpc_module::Methods, http_server::HttpServerBuilder, ws_server::WsServerBuilder, diff --git a/bin/consensus-tests.rs b/bin/consensus-tests.rs index 97d5eddc..20dd23a6 100644 --- a/bin/consensus-tests.rs +++ b/bin/consensus-tests.rs @@ -1,7 +1,6 @@ #![feature(let_else)] #![allow(clippy::suspicious_else_formatting)] use akula::{ - binutil::ExpandedPathBuf, consensus::{ difficulty::{canonical_difficulty, BlockDifficultyBombData}, *, @@ -15,6 +14,7 @@ use anyhow::{bail, ensure, format_err}; use bytes::Bytes; use clap::Parser; use educe::Educe; +use expanded_pathbuf::ExpandedPathBuf; use fastrlp::*; use maplit::*; use once_cell::sync::Lazy; diff --git a/src/binutil.rs b/src/binutil.rs index 0df6a36c..30b93aae 100644 --- a/src/binutil.rs +++ b/src/binutil.rs @@ -2,26 +2,13 @@ use crate::{models::ChainSpec, res::chainspec}; use anyhow::format_err; use derive_more::*; use directories::ProjectDirs; +use expanded_pathbuf::ExpandedPathBuf; use std::{ fmt::Display, fs::File, path::{Path, PathBuf}, - str::FromStr, }; -#[derive(AsRef, Clone, Debug, Deref, DerefMut, From)] -#[as_ref(forward)] -#[from(forward)] -pub struct ExpandedPathBuf(pub PathBuf); - -impl FromStr for ExpandedPathBuf { - type Err = anyhow::Error; - - fn from_str(s: &str) -> Result { - Ok(Self(PathBuf::from_str(&shellexpand::full(s)?)?)) - } -} - #[derive(Clone, Debug, Deref, DerefMut, FromStr)] pub struct AkulaDataDir(pub ExpandedPathBuf);