Skip to content

Commit 40e039d

Browse files
committed
Update dependencies. Remove minor and patch version numbers from Cargo.toml file
1 parent f8fe5f4 commit 40e039d

File tree

16 files changed

+923
-889
lines changed

16 files changed

+923
-889
lines changed

Cargo.lock

+723-694
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+158-155
Original file line numberDiff line numberDiff line change
@@ -272,174 +272,177 @@ missing_panics_doc = { level = 'allow', priority = 1 }
272272
private_intra_doc_links = 'allow'
273273

274274
[workspace.dependencies]
275-
aes = { version = '0.8.4', features = ['zeroize'] }
276-
anyhow = { version = '1.0.86', features = ['backtrace'] }
277-
arc-swap = '1.7.1'
278-
assert-json-diff = '2.0.2'
279-
async-channel = '1.9.0'
280-
async-trait = '0.1.80'
281-
asynchronous-codec = '0.7.0'
282-
axum = { version = '0.7.5' }
283-
axum-extra = { version = '0.9.3', features = ['typed-header', 'query'] }
284-
base64 = '0.22.1'
285-
bincode = '1.3.3'
286-
bit_field = '0.10.2'
287-
bitvec = '1.0.1'
288-
blst = { version = '0.3.12', features = ['portable'] }
289-
bstr = '1.9.1'
290-
build-time = '0.1.3'
291-
byteorder = '1.5.0'
292-
bytes = '1.6.0'
293-
bytesize = { version = '1.3.0', features = ['serde'] }
294-
cached = '0.52.0'
295-
chrono = '0.4.38'
296-
clap = { version = '4.5.8', features = ['derive'] }
297-
const_format = '0.2.32'
298-
constant_time_eq = '0.3.0'
299-
conv = '0.3.3'
300-
criterion = '0.5.1'
301-
crossbeam-skiplist = '0.1.3'
302-
crossbeam-utils = '0.8.20'
303-
ctr = { version = '0.9.2', features = ['zeroize'] }
304-
darling = '0.20.10'
275+
aes = { version = '0.8', features = ['zeroize'] }
276+
anyhow = { version = '1', features = ['backtrace'] }
277+
arc-swap = '1'
278+
assert-json-diff = '2'
279+
async-channel = '1'
280+
async-trait = '0.1'
281+
asynchronous-codec = '0.7'
282+
axum = { version = '0.7' }
283+
axum-extra = { version = '0.9', features = ['typed-header', 'query'] }
284+
base64 = '0.22'
285+
bincode = '1'
286+
bit_field = '0.10'
287+
bitvec = '1'
288+
blst = { version = '0.3', features = ['portable'] }
289+
bstr = '1'
290+
build-time = '0.1'
291+
byteorder = '1'
292+
bytes = '1'
293+
bytesize = { version = '1', features = ['serde'] }
294+
cached = '0.53'
295+
chrono = '0.4'
296+
clap = { version = '4', features = ['derive'] }
297+
const_format = '0.2'
298+
constant_time_eq = '0.3'
299+
conv = '0.3'
300+
criterion = '0.5'
301+
crossbeam-skiplist = '0.1'
302+
crossbeam-utils = '0.8'
303+
ctr = { version = '0.9', features = ['zeroize'] }
304+
darling = '0.20'
305305
dedicated_executor = { path = 'dedicated_executor' }
306-
delay_map = '0.3.0'
307-
derivative = '2.2.0'
308-
derive_more = '0.99.18'
309-
dirs = '5.0.1'
310-
discv5 = { version = '0.4.1', features = ['libp2p'] }
311-
drain_filter_polyfill = '0.1.3'
312-
duplicate = '1.0.0'
313-
easy-ext = '1.0.2'
314-
either = '1.13.0'
315-
enum-iterator = '2.1.0'
316-
enum-map = '2.7.3'
317-
enumset = '1.1.3'
318-
env_logger = '0.11.3'
319-
ethereum-types = '0.14.1'
306+
delay_map = '0.4'
307+
derivative = '2'
308+
derive_more = { version = '1', features = ["full"] }
309+
dirs = '5'
310+
discv5 = { version = '0.4', features = ['libp2p'] }
311+
drain_filter_polyfill = '0.1'
312+
duplicate = '1'
313+
easy-ext = '1'
314+
either = '1'
315+
enum-iterator = '2'
316+
enum-map = '2'
317+
enumset = '1'
318+
env_logger = '0.11'
319+
ethereum-types = '0.14'
320320
fixed-hash = '0.8.0'
321-
fnv = '1.0.7'
322-
fs-err = { version = '2.11.0', features = ['tokio'] }
323-
fs_extra = '1.3.0'
324-
futures = '0.3.30'
321+
fnv = '1'
322+
fs-err = { version = '2', features = ['tokio'] }
323+
fs_extra = '1'
324+
futures = '0.3'
325325
futures-ticker = '0.0.3'
326-
futures-timer = '3.0.3'
327-
generic-array = { version = '0.14.6', features = ['serde'] }
328-
getrandom = '0.2.15'
329-
git-version = '0.3.9'
330-
glob = '0.3.1'
331-
good_lp = { version = '1.8.1', default-features = false, features = ['highs'] }
332-
hash_hasher = '2.0.3'
333-
hex = { version = '0.4.3', features = ['serde'] }
334-
hex-literal = '0.4.1'
335-
hex_fmt = '0.3.0'
336-
hmac = '0.12.1'
337-
http = '1.1.0'
338-
http-body-util = '0.1.2'
339-
httparse = '1.9.4'
340-
httpmock = '0.7.0'
341-
hyper = '1.4.0'
342-
igd-next = '0.14.3'
326+
futures-timer = '3'
327+
generic-array = { version = '0.14', features = ['serde'] }
328+
getrandom = '0.2'
329+
git-version = '0.3'
330+
glob = '0.3'
331+
good_lp = { version = '1', default-features = false, features = ['highs'] }
332+
hash_hasher = '2'
333+
hex = { version = '0.4', features = ['serde'] }
334+
hex-literal = '0.4'
335+
hex_fmt = '0.3'
336+
hmac = '0.12'
337+
http = '1'
338+
http-body-util = '0.1'
339+
httparse = '1'
340+
httpmock = '0.7'
341+
hyper = '1'
342+
igd-next = '0.15'
343343
# Possible optimization: fork `im` and make it use `triomphe`.
344344
# It's easy to do, but the amount of memory it saves is negligible.
345-
im = '15.1.0'
346-
impl-serde = '0.4.0'
347-
integer-sqrt = '0.1.5'
348-
instant = '0.1.13'
349-
itertools = '0.13.0'
350-
jemalloc-ctl = '0.5.4'
351-
jemallocator = '0.5.4'
352-
jwt-simple = { version = '0.12.9', default-features = false, features = ['pure-rust'] }
345+
im = '15'
346+
impl-serde = '0.4'
347+
integer-sqrt = '0.1'
348+
instant = '0.1'
349+
itertools = '0.13'
350+
jemalloc-ctl = '0.5'
351+
jemallocator = '0.5'
352+
jwt-simple = { version = '0.12', default-features = false, features = ['pure-rust'] }
353353
kzg = { git = 'https://github.com/grandinetech/rust-kzg.git', branch = 'integration-raw' }
354-
lazy_static = '1.5.0'
355-
libmdbx = { git = 'https://github.com/paradigmxyz/reth.git', package = 'reth-libmdbx', rev = '2d01f3608697eed05357fb847e25ad33ab59d702' }
354+
lazy_static = '1'
355+
libmdbx = { git = 'https://github.com/paradigmxyz/reth.git', package = 'reth-libmdbx', rev = 'c228fe15808c3acbf18dc3af1a03ef5cbdcda07a' }
356356
libp2p = { version = '0.53', default-features = false, features = ['metrics', 'dns', 'ecdsa', 'identify', 'macros', 'noise', 'plaintext', 'secp256k1', 'serde', 'tcp', 'tokio', 'yamux', 'quic', 'upnp'] }
357-
libp2p-mplex = '0.41.0'
358-
log = '0.4.22'
359-
lru = '0.12.3'
360-
mediatype = '0.19.18'
361-
memoffset = '0.9.1'
362-
mime = '0.3.17'
363-
nonzero_ext = '0.3.0'
364-
num-bigint = '0.4.6'
365-
num-integer = '0.1.46'
366-
num-traits = '0.2.19'
367-
num_cpus = '1.16.0'
368-
num_threads = '0.1.7'
369-
once_cell = '1.19.0'
370-
openssl = '0.10.64'
371-
parking_lot = '0.12.3'
372-
parse-display = '0.9.1'
373-
pathdiff = '0.2.1'
374-
pbkdf2 = '0.12.2'
375-
primitive-types = '0.12.2'
376-
proc-macro-crate = '3.1.0'
377-
proc-macro2 = '1.0.86'
378-
prometheus = '0.13.4'
379-
prometheus-client = '0.22.2'
380-
psutil = '3.3.0'
381-
quick-protobuf = '0.8.1'
382-
quick-protobuf-codec = '0.3.1'
383-
quickcheck = '1.0.3'
384-
quickcheck_macros = '1.0.0'
385-
quote = '1.0.36'
386-
rand = '0.8.5'
387-
rayon = '1.10.0'
388-
rc-box = '1.2.0'
389-
refinery = { version = '0.8.14', features = ['rusqlite']}
390-
regex = '1.10.5'
391-
replace_with = '0.1.7'
392-
reqwest = { version = '0.12.5', features = ['json', 'native-tls-vendored'] }
393-
rusqlite = { version = '0.31.0', features = ['bundled'] }
357+
libp2p-mplex = '0.41'
358+
log = '0.4'
359+
lru = '0.12'
360+
mediatype = '0.19'
361+
memoffset = '0.9'
362+
mime = '0.3'
363+
nonzero_ext = '0.3'
364+
num-bigint = '0.4'
365+
num-integer = '0.1'
366+
num-traits = '0.2'
367+
num_cpus = '1'
368+
num_threads = '0.1'
369+
once_cell = '1'
370+
openssl = '0.10'
371+
parking_lot = '0.12'
372+
parse-display = '0.10'
373+
pathdiff = '0.2'
374+
pbkdf2 = '0.12'
375+
primitive-types = '0.12'
376+
proc-macro-crate = '3'
377+
proc-macro2 = '1'
378+
prometheus = '0.13'
379+
prometheus-client = '0.22'
380+
psutil = '3'
381+
quick-protobuf = '0.8'
382+
quick-protobuf-codec = '0.3'
383+
quickcheck = '1'
384+
quickcheck_macros = '1'
385+
quote = '1'
386+
rand = '0.8'
387+
rayon = '1'
388+
rc-box = '1'
389+
# Currently refinery does not support rusqlite version 0.32
390+
refinery = { git = 'https://github.com/manuteleco/refinery.git', rev = '63f3c39a8adb40e9e7b7f9c8b21a4fee2d685e3d', features = ['rusqlite'] }
391+
regex = '1'
392+
replace_with = '0.1'
393+
reqwest = { version = '0.12', features = ['json', 'native-tls-vendored'] }
394+
rusqlite = { version = '0.32', features = ['bundled'] }
394395
rust-kzg-blst = { git = 'https://github.com/grandinetech/rust-kzg.git', branch = 'integration-raw' }
395-
scrypt = '0.11.0'
396-
semver = '1.0.23'
397-
serde = { version = '1.0.203', features = ['derive', 'rc'] }
398-
serde-aux = '4.5.0'
399-
serde_json = { version = '1.0.120', features = ['preserve_order'] }
400-
serde_qs = { version = '0.13.0', features = ['axum'] }
401-
serde_repr = '0.1.19'
402-
serde_with = '3.8.3'
403-
serde_yaml = '0.9.33'
396+
scrypt = '0.11'
397+
semver = '1'
398+
serde = { version = '1', features = ['derive', 'rc'] }
399+
serde-aux = '4'
400+
serde_json = { version = '1', features = ['preserve_order'] }
401+
serde_qs = { version = '0.13', features = ['axum'] }
402+
serde_repr = '0.1'
403+
serde_with = '3'
404+
# TODO: replace serde_yaml with alternative, since it is deprecated:
405+
# https://users.rust-lang.org/t/serde-yaml-deprecation-alternatives/108868/18
406+
serde_yaml = '0.9'
404407
# The `asm` feature in `sha2` doesn't do anything on recent `x86_64` CPUs
405408
# because `sha2` defaults to using CPU intrinsics.
406-
sha2 = { version = '0.10.8', features = ['compress'] }
407-
slog = { version = '2.7.0', features = ['max_level_trace'] }
408-
slog-async = '2.8.0'
409-
slog-stdlog = '4.1.1'
410-
slog-term = '2.9.0'
411-
smallvec = { version = '1.13.2', features = ['serde', 'union'] }
412-
snap = '1.1.1'
413-
static_assertions = '1.1.0'
414-
strum = { version = '0.26.3', features = ['derive'] }
415-
syn = { version = '2.0.68', features = ['full'] }
416-
sysinfo = '0.30.12'
417-
tap = '1.0.1'
418-
tempfile = '3.10.1'
419-
test-case = '3.3.1'
420-
test-generator = '0.3.1'
421-
testing_logger = '0.1.1'
422-
thiserror = '1.0.61'
423-
tiny-keccak = '2.0.2'
424-
tokio = { version = '1.38.0', features = ['fs', 'macros', 'rt-multi-thread', 'signal', 'sync', 'time'] }
425-
tokio-io-timeout = '1.2.0'
426-
tokio-stream = { version = '0.1.15', features = ['sync'] }
409+
sha2 = { version = '0.10', features = ['compress'] }
410+
slog = { version = '2', features = ['max_level_trace'] }
411+
slog-async = '2'
412+
slog-stdlog = '4'
413+
slog-term = '2'
414+
smallvec = { version = '1', features = ['serde', 'union'] }
415+
snap = '1'
416+
static_assertions = '1'
417+
strum = { version = '0.26', features = ['derive'] }
418+
syn = { version = '2', features = ['full'] }
419+
sysinfo = '0.31'
420+
tap = '1'
421+
tempfile = '3'
422+
test-case = '3'
423+
test-generator = '0.3'
424+
testing_logger = '0.1'
425+
thiserror = '1'
426+
tiny-keccak = '2'
427+
tokio = { version = '1', features = ['fs', 'macros', 'rt-multi-thread', 'signal', 'sync', 'time'] }
428+
tokio-io-timeout = '1'
429+
tokio-stream = { version = '0.1', features = ['sync'] }
427430
tokio-util = { version = '0.7', features = ['codec', 'compat', 'time'] }
428-
tower = { version = '0.4.13', features = ['timeout'] }
429-
tower-http = { version = '0.5.2', features = ['cors', 'trace'] }
430-
tracing = '0.1.40'
431-
triomphe = '0.1.13'
432-
tynm = '0.1.10'
433-
typenum = '1.17.0'
434-
unicode-normalization = '0.1.23'
431+
tower = { version = '0.5', features = ['timeout'] }
432+
tower-http = { version = '0.5', features = ['cors', 'trace'] }
433+
tracing = '0.1'
434+
triomphe = '0.1'
435+
tynm = '0.1'
436+
typenum = '1'
437+
unicode-normalization = '0.1'
435438
unsigned-varint = { version = '= 0.8', features = ['codec'] }
436-
unwrap_none = '0.1.2'
437-
url = '2.5.2'
438-
uuid = { version = '1.9.1', features = ['serde', 'v4'] }
439-
variant_count = '1.1.0'
440-
void = '1.0.2'
439+
unwrap_none = '0.1'
440+
url = '2'
441+
uuid = { version = '1', features = ['serde', 'v4'] }
442+
variant_count = '1'
443+
void = '1'
441444
web3 = { git = 'https://github.com/grandinetech/rust-web3.git' }
442-
zeroize = { version = '1.8.1', features = ['derive', 'serde'] }
445+
zeroize = { version = '1', features = ['derive', 'serde'] }
443446

444447
allocator = { path = 'allocator' }
445448
arithmetic = { path = 'arithmetic' }

bls/src/secret_key.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use core::{
66
use std::borrow::ToOwned;
77

88
use blst::min_pk::SecretKey as RawSecretKey;
9-
use derive_more::DebugCustom;
9+
use derive_more::Debug;
1010
use serde::Serialize;
1111
use ssz::{SszHash, SszWrite};
1212
use static_assertions::assert_not_impl_any;
@@ -15,9 +15,9 @@ use crate::{consts::DOMAIN_SEPARATION_TAG, Error, PublicKey, SecretKeyBytes, Sig
1515

1616
// `RawSecretKey` already implements `Zeroize` (with `zeroize(drop)`):
1717
// <https://github.com/supranational/blst/blob/v0.3.10/bindings/rust/src/lib.rs#L458-L460>
18-
#[derive(DebugCustom)]
18+
#[derive(Debug)]
1919
// Inspired by `DebugSecret` from the `secrecy` crate.
20-
#[debug(fmt = "[REDACTED]")]
20+
#[debug("[REDACTED]")]
2121
pub struct SecretKey(RawSecretKey);
2222

2323
// Prevent `SecretKey` from implementing some traits to avoid leaking secret keys.

eth1_api/src/auth.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use thiserror::Error;
1818
use zeroize::Zeroizing;
1919

2020
#[cfg(test)]
21-
use derive_more::DebugCustom;
21+
use derive_more::Debug;
2222

2323
const JWT_SECRET_SIZE_MIN_BYTES: usize = 32;
2424

@@ -116,8 +116,8 @@ impl Auth {
116116
}
117117
}
118118

119-
#[cfg_attr(test, derive(DebugCustom))]
120-
#[cfg_attr(test, debug(fmt = "[REDACTED]"))]
119+
#[cfg_attr(test, derive(Debug))]
120+
#[cfg_attr(test, debug("[REDACTED]"))]
121121
struct Secret {
122122
key: HS256Key,
123123
}

0 commit comments

Comments
 (0)