From a40f3d775c13b54ad3e57643e2d2cd6a9d24bf92 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Fri, 28 Apr 2023 20:05:00 +0200 Subject: [PATCH] chore(deps): bump enr + secp256k1 (#2443) --- Cargo.lock | 53 ++++++++++++++-------------------- bin/reth/Cargo.toml | 2 +- crates/interfaces/Cargo.toml | 4 +-- crates/net/discv4/Cargo.toml | 4 +-- crates/net/dns/Cargo.toml | 4 +-- crates/net/ecies/Cargo.toml | 2 +- crates/net/eth-wire/Cargo.toml | 2 +- crates/net/network/Cargo.toml | 6 ++-- crates/primitives/Cargo.toml | 4 +-- crates/rpc/rpc/Cargo.toml | 2 +- crates/staged-sync/Cargo.toml | 6 ++-- crates/storage/db/Cargo.toml | 4 +-- 12 files changed, 42 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5bbb9607..148473f3e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1632,9 +1632,9 @@ dependencies = [ [[package]] name = "enr" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb4d5fbf6f56acecd38f5988eb2e4ae412008a2a30268c748c701ec6322f39d4" +checksum = "cf56acd72bb22d2824e66ae8e9e5ada4d0de17a69c7fd35569dde2ada8ec9116" dependencies = [ "base64 0.13.1", "bytes", @@ -1643,7 +1643,7 @@ dependencies = [ "log", "rand 0.8.5", "rlp", - "secp256k1 0.26.0", + "secp256k1", "serde", "sha3", "zeroize", @@ -1939,7 +1939,7 @@ dependencies = [ "auto_impl", "base64 0.21.0", "bytes", - "enr 0.8.0", + "enr 0.8.1", "ethers-core", "futures-channel", "futures-core", @@ -4606,7 +4606,7 @@ dependencies = [ "reth-tasks", "reth-tracing", "reth-transaction-pool", - "secp256k1 0.26.0", + "secp256k1", "serde", "serde_json", "shellexpand", @@ -4748,7 +4748,7 @@ dependencies = [ "reth-interfaces", "reth-libmdbx", "reth-primitives", - "secp256k1 0.26.0", + "secp256k1", "serde", "serde_json", "tempfile", @@ -4763,7 +4763,7 @@ name = "reth-discv4" version = "0.1.0" dependencies = [ "discv5", - "enr 0.8.0", + "enr 0.8.1", "generic-array", "hex", "rand 0.8.5", @@ -4773,7 +4773,7 @@ dependencies = [ "reth-rlp", "reth-rlp-derive", "reth-tracing", - "secp256k1 0.26.0", + "secp256k1", "serde", "thiserror", "tokio", @@ -4787,7 +4787,7 @@ version = "0.1.0" dependencies = [ "async-trait", "data-encoding", - "enr 0.8.0", + "enr 0.8.1", "linked_hash_set", "parking_lot 0.12.1", "reth-net-common", @@ -4795,7 +4795,7 @@ dependencies = [ "reth-rlp", "reth-tracing", "schnellru", - "secp256k1 0.26.0", + "secp256k1", "serde", "serde_with", "thiserror", @@ -4851,7 +4851,7 @@ dependencies = [ "reth-net-common", "reth-primitives", "reth-rlp", - "secp256k1 0.26.0", + "secp256k1", "sha2 0.10.6", "sha3", "thiserror", @@ -4883,7 +4883,7 @@ dependencies = [ "reth-primitives", "reth-rlp", "reth-tracing", - "secp256k1 0.26.0", + "secp256k1", "serde", "smol_str", "snap", @@ -4915,7 +4915,7 @@ dependencies = [ "reth-primitives", "reth-rpc-types", "revm-primitives", - "secp256k1 0.26.0", + "secp256k1", "thiserror", "tokio", "tokio-stream", @@ -5022,7 +5022,7 @@ dependencies = [ "aquamarine", "async-trait", "auto_impl", - "enr 0.8.0", + "enr 0.8.1", "ethers-core", "ethers-middleware", "ethers-providers", @@ -5055,7 +5055,7 @@ dependencies = [ "reth-tasks", "reth-tracing", "reth-transaction-pool", - "secp256k1 0.26.0", + "secp256k1", "serde", "serde_json", "serial_test", @@ -5128,7 +5128,7 @@ dependencies = [ "reth-rlp-derive", "revm-primitives", "ruint", - "secp256k1 0.26.0", + "secp256k1", "serde", "serde_json", "serde_with", @@ -5251,7 +5251,7 @@ dependencies = [ "revm", "revm-primitives", "schnellru", - "secp256k1 0.26.0", + "secp256k1", "serde", "serde_json", "thiserror", @@ -5346,7 +5346,7 @@ version = "0.1.0" dependencies = [ "async-trait", "confy", - "enr 0.8.0", + "enr 0.8.1", "ethers-core", "ethers-middleware", "ethers-providers", @@ -5366,7 +5366,7 @@ dependencies = [ "reth-staged-sync", "reth-stages", "reth-tracing", - "secp256k1 0.26.0", + "secp256k1", "serde", "serde_json", "shellexpand", @@ -5513,7 +5513,7 @@ dependencies = [ "once_cell", "revm-primitives", "ripemd", - "secp256k1 0.27.0", + "secp256k1", "sha2 0.10.6", "sha3", "substrate-bn", @@ -5877,24 +5877,15 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secp256k1" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" -dependencies = [ - "rand 0.8.5", - "secp256k1-sys", - "serde", -] - [[package]] name = "secp256k1" version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" dependencies = [ + "rand 0.8.5", "secp256k1-sys", + "serde", ] [[package]] diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index 413652e7a..6916e114d 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -41,7 +41,7 @@ reth-discv4 = { path = "../../crates/net/discv4" } built = { version = "0.6", features = ["chrono", "semver"] } # crypto -secp256k1 = { version = "0.26.0", features = [ +secp256k1 = { version = "0.27.0", features = [ "global-context", "rand-std", "recovery", diff --git a/crates/interfaces/Cargo.toml b/crates/interfaces/Cargo.toml index f496b8597..0943d8653 100644 --- a/crates/interfaces/Cargo.toml +++ b/crates/interfaces/Cargo.toml @@ -26,7 +26,7 @@ futures = "0.3" tokio-stream = "0.1.11" rand = "0.8.5" arbitrary = { version = "1.1.7", features = ["derive"], optional = true } -secp256k1 = { version = "0.26.0", default-features = false, features = [ +secp256k1 = { version = "0.27.0", default-features = false, features = [ "alloc", "recovery", "rand", @@ -40,7 +40,7 @@ tokio = { version = "1.21.2", features = ["full"] } tokio-stream = { version = "0.1.11", features = ["sync"] } arbitrary = { version = "1.1.7", features = ["derive"] } hex-literal = "0.3" -secp256k1 = { version = "0.26.0", default-features = false, features = [ +secp256k1 = { version = "0.27.0", default-features = false, features = [ "alloc", "recovery", "rand", diff --git a/crates/net/discv4/Cargo.toml b/crates/net/discv4/Cargo.toml index 93fcb95cb..5a60365db 100644 --- a/crates/net/discv4/Cargo.toml +++ b/crates/net/discv4/Cargo.toml @@ -19,13 +19,13 @@ reth-net-nat = { path = "../nat" } # ethereum discv5 = { git = "https://github.com/sigp/discv5" } -secp256k1 = { version = "0.26.0", features = [ +secp256k1 = { version = "0.27.0", features = [ "global-context", "rand-std", "recovery", "serde" ] } -enr = { version = "0.8.0", default-features = false, features = [ +enr = { version = "0.8.1", default-features = false, features = [ "rust-secp256k1", ] } diff --git a/crates/net/dns/Cargo.toml b/crates/net/dns/Cargo.toml index 29c4a1c56..437b9d1d3 100644 --- a/crates/net/dns/Cargo.toml +++ b/crates/net/dns/Cargo.toml @@ -14,13 +14,13 @@ reth-net-common = { path = "../common" } reth-rlp = { path = "../../rlp" } # ethereum -secp256k1 = { version = "0.26.0", features = [ +secp256k1 = { version = "0.27.0", features = [ "global-context", "rand-std", "recovery", "serde" ] } -enr = { version = "0.8.0", default-features = false, features = ["rust-secp256k1"] } +enr = { version = "0.8.1", default-features = false, features = ["rust-secp256k1"] } # async/futures tokio = { version = "1", features = ["io-util", "net", "time"] } diff --git a/crates/net/ecies/Cargo.toml b/crates/net/ecies/Cargo.toml index f5c76d68d..ccfdaff9d 100644 --- a/crates/net/ecies/Cargo.toml +++ b/crates/net/ecies/Cargo.toml @@ -30,7 +30,7 @@ byteorder = "1.4.3" rand = "0.8.5" ctr = "0.9.2" digest = "0.10.5" -secp256k1 = { version = "0.26.0", features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { version = "0.27.0", features = ["global-context", "rand-std", "recovery"] } sha2 = "0.10.6" sha3 = "0.10.5" aes = "0.8.1" diff --git a/crates/net/eth-wire/Cargo.toml b/crates/net/eth-wire/Cargo.toml index 831298a44..1daaeea69 100644 --- a/crates/net/eth-wire/Cargo.toml +++ b/crates/net/eth-wire/Cargo.toml @@ -47,7 +47,7 @@ tokio-util = { version = "0.7.4", features = ["io", "codec"] } hex-literal = "0.3" hex = "0.4" rand = "0.8" -secp256k1 = { version = "0.26.0", features = ["global-context", "rand-std", "recovery"] } +secp256k1 = { version = "0.27.0", features = ["global-context", "rand-std", "recovery"] } arbitrary = { version = "1.1.7", features = ["derive"] } proptest = { version = "1.0" } diff --git a/crates/net/network/Cargo.toml b/crates/net/network/Cargo.toml index 97f7993af..61dc53aa5 100644 --- a/crates/net/network/Cargo.toml +++ b/crates/net/network/Cargo.toml @@ -60,13 +60,13 @@ async-trait = "0.1" linked_hash_set = "0.1" linked-hash-map = "0.5.6" rand = "0.8" -secp256k1 = { version = "0.26.0", features = [ +secp256k1 = { version = "0.27.0", features = [ "global-context", "rand-std", "recovery", ] } -enr = { version = "0.8.0", features = ["rust-secp256k1"], optional = true } +enr = { version = "0.8.1", features = ["rust-secp256k1"], optional = true } ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false, optional = true } tempfile = { version = "3.3", optional = true } @@ -88,7 +88,7 @@ ethers-providers = { git = "https://github.com/gakonst/ethers-rs", default-featu ethers-signers = { git = "https://github.com/gakonst/ethers-rs", default-features = false } ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", default-features = false } -enr = { version = "0.8.0", features = ["serde", "rust-secp256k1"] } +enr = { version = "0.8.1", features = ["serde", "rust-secp256k1"] } # misc hex = "0.4" diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 569b55e49..f4a4eea5e 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -27,7 +27,7 @@ fixed-hash = { version = "0.8", default-features = false, features = [ ] } # crypto -secp256k1 = { version = "0.26.0", default-features = false, features = [ +secp256k1 = { version = "0.27.0", default-features = false, features = [ "global-context", "alloc", "recovery", @@ -75,7 +75,7 @@ proptest-derive = "0.3" # necessary so we don't hit a "undeclared 'std'": # https://github.com/paradigmxyz/reth/pull/177#discussion_r1021172198 -secp256k1 = "0.26.0" +secp256k1 = "0.27.0" criterion = "0.4.0" pprof = { version = "0.11", features = [ "flamegraph", diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index 0ba4c1114..eafff6dbc 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -46,7 +46,7 @@ tokio-util = "0.7" pin-project = "1.0" bytes = "1.4" -secp256k1 = { version = "0.26.0", features = [ +secp256k1 = { version = "0.27.0", features = [ "global-context", "rand-std", "recovery" diff --git a/crates/staged-sync/Cargo.toml b/crates/staged-sync/Cargo.toml index 8fa3a3305..31460b24b 100644 --- a/crates/staged-sync/Cargo.toml +++ b/crates/staged-sync/Cargo.toml @@ -31,7 +31,7 @@ tracing = "0.1.37" # crypto rand = { version = "0.8", optional = true } -secp256k1 = { version = "0.26.0", features = [ +secp256k1 = { version = "0.27.0", features = [ "global-context", "rand-std", "recovery", @@ -41,7 +41,7 @@ secp256k1 = { version = "0.26.0", features = [ thiserror = "1" # enr -enr = { version = "0.8.0", features = ["serde", "rust-secp256k1"], optional = true } +enr = { version = "0.8.1", features = ["serde", "rust-secp256k1"], optional = true } # ethers ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false, optional = true } @@ -70,7 +70,7 @@ futures = "0.3" tokio = { version = "1", features = ["io-util", "net", "macros", "rt-multi-thread", "time"] } # crypto -secp256k1 = { version = "0.26.0", features = [ +secp256k1 = { version = "0.27.0", features = [ "global-context", "rand-std", "recovery", diff --git a/crates/storage/db/Cargo.toml b/crates/storage/db/Cargo.toml index 14e79cecc..a628745ad 100644 --- a/crates/storage/db/Cargo.toml +++ b/crates/storage/db/Cargo.toml @@ -22,7 +22,7 @@ parity-scale-codec = { version = "3.2.1", features = ["bytes"] } futures = "0.3.25" tokio-stream = "0.1.11" rand = "0.8.5" -secp256k1 = { version = "0.26.0", default-features = false, features = [ +secp256k1 = { version = "0.27.0", default-features = false, features = [ "alloc", "recovery", "rand", @@ -60,7 +60,7 @@ tokio = { version = "1.21.2", features = ["full"] } reth-db = { path = ".", features = ["test-utils", "bench"] } # needed for test-fuzz to work properly, see https://github.com/paradigmxyz/reth/pull/177#discussion_r1021172198 -secp256k1 = "0.26.0" +secp256k1 = "0.27.0" async-trait = "0.1.58"