jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): upgrade secp256k1+enr (#1715)

Browse Source
This commit is contained in:
Matthias Seitz
2023-03-15 11:15:55 +01:00
committed by GitHub
parent 91f26f455f
commit 15d79cedad
15 changed files with 361 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

458
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
bin/reth/Cargo.toml
View File

@ -59,4 +59,4 @@ comfy-table = "6.1.4"
crossterm = "0.25.0"
tui = "0.19.0"
jsonrpsee = { version = "0.16", features = ["server"] }
human_bytes = "0.4.1"
human_bytes = "0.4.1"

4
crates/interfaces/Cargo.toml
View File

@ -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.24.2", default-features = false, features = [
secp256k1 = { version = "0.26.0", default-features = false, features = [
"alloc",
"recovery",
"rand",
@ -39,7 +39,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.24.2", default-features = false, features = [
secp256k1 = { version = "0.26.0", default-features = false, features = [
"alloc",
"recovery",
"rand",

5
crates/net/discv4/Cargo.toml
View File

@ -19,12 +19,13 @@ reth-net-nat = { path = "../nat" }
# ethereum
discv5 = { git = "https://github.com/sigp/discv5" }
secp256k1 = { version = "0.24", features = [
secp256k1 = { version = "0.26.0", features = [
"global-context",
"rand-std",
"recovery",
"serde"
] }
enr = { version = "0.7.0", default-features = false, features = [
enr = { version = "0.8.0", default-features = false, features = [
"rust-secp256k1",
] }

5
crates/net/dns/Cargo.toml
View File

@ -14,12 +14,13 @@ reth-net-common = { path = "../common" }
reth-rlp = { path = "../../rlp" }
# ethereum
secp256k1 = { version = "0.24", features = [
secp256k1 = { version = "0.26.0", features = [
"global-context",
"rand-std",
"recovery",
"serde"
] }
enr = { version = "0.7.0", default-features = false, features = ["rust-secp256k1"] }
enr = { version = "0.8.0", default-features = false, features = ["rust-secp256k1"] }
# async/futures
tokio = { version = "1", features = ["io-util", "net", "time"] }

2
crates/net/dns/src/lib.rs
View File

@ -1,4 +1,4 @@
#![warn(missing_docs, unreachable_pub)]
#![warn(missing_docs, unreachable_pub, unused_crate_dependencies)]
#![deny(unused_must_use, rust_2018_idioms)]
#![doc(test(
no_crate_inject,

35
crates/net/dns/src/tree.rs
View File

@ -27,7 +27,11 @@ use data_encoding::{BASE32_NOPAD, BASE64URL_NOPAD};
use enr::{Enr, EnrError, EnrKey, EnrKeyUnambiguous, EnrPublicKey};
use reth_primitives::{bytes::Bytes, hex};
use secp256k1::SecretKey;
use std::{fmt, str::FromStr};
use std::{
fmt,
hash::{Hash, Hasher},
str::FromStr,
};
#[cfg(feature = "serde")]
use serde_with::{DeserializeFromStr, SerializeDisplay};
@ -222,7 +226,7 @@ impl fmt::Display for BranchEntry {
}
/// A link entry
#[derive(Debug, Clone, Hash, Eq, PartialEq)]
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(SerializeDisplay, DeserializeFromStr))]
pub struct LinkEntry<K: EnrKeyUnambiguous = SecretKey> {
pub domain: String,
@ -248,6 +252,33 @@ impl<K: EnrKeyUnambiguous> LinkEntry<K> {
}
}
impl<K> PartialEq for LinkEntry<K>
where
K: EnrKeyUnambiguous,
K::PublicKey: PartialEq,
{
fn eq(&self, other: &Self) -> bool {
self.domain == other.domain && self.pubkey == other.pubkey
}
}
impl<K> Eq for LinkEntry<K>
where
K: EnrKeyUnambiguous,
K::PublicKey: Eq + PartialEq,
{
}
impl<K> Hash for LinkEntry<K>
where
K: EnrKeyUnambiguous,
K::PublicKey: Hash,
{
fn hash<H: Hasher>(&self, state: &mut H) {
self.domain.hash(state);
self.pubkey.hash(state);
}
}
impl<K: EnrKeyUnambiguous> FromStr for LinkEntry<K> {
type Err = ParseDnsEntryError;

2
crates/net/ecies/Cargo.toml
View File

@ -30,7 +30,7 @@ byteorder = "1.4.3"
rand = "0.8.5"
ctr = "0.9.2"
digest = "0.10.5"
secp256k1 = { version = "0.24.2", features = ["global-context", "rand-std", "recovery"] }
secp256k1 = { version = "0.26.0", features = ["global-context", "rand-std", "recovery"] }
sha2 = "0.10.6"
sha3 = "0.10.5"
aes = "0.8.1"

2
crates/net/eth-wire/Cargo.toml
View File

@ -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.24.2", features = ["global-context", "rand-std", "recovery"] }
secp256k1 = { version = "0.26.0", features = ["global-context", "rand-std", "recovery"] }
arbitrary = { version = "1.1.7", features = ["derive"] }
proptest = { version = "1.0" }

6
crates/net/network/Cargo.toml
View File

@ -59,13 +59,13 @@ async-trait = "0.1"
linked_hash_set = "0.1"
linked-hash-map = "0.5.6"
rand = "0.8"
secp256k1 = { version = "0.24", features = [
secp256k1 = { version = "0.26.0", features = [
"global-context",
"rand-std",
"recovery",
] }
enr = { version = "0.7.0", features = ["rust-secp256k1"], optional = true }
enr = { version = "0.8.0", 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 }
@ -87,7 +87,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.7.0", features = ["serde", "rust-secp256k1"] }
enr = { version = "0.8.0", features = ["serde", "rust-secp256k1"] }
# misc
hex = "0.4"

6
crates/primitives/Cargo.toml
View File

@ -26,7 +26,7 @@ fixed-hash = { version = "0.8", default-features = false, features = [
] }
# crypto
secp256k1 = { version = "0.24.2", default-features = false, features = [
secp256k1 = { version = "0.26.0", default-features = false, features = [
"global-context",
"alloc",
"recovery",
@ -74,7 +74,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.24.2"
secp256k1 = "0.26.0"
criterion = "0.4.0"
pprof = { version = "0.11", features = [
"flamegraph",
@ -94,4 +94,4 @@ test-utils = []
[[bench]]
name = "recover_ecdsa_crit"
harness = false
harness = false

2
crates/revm/revm-primitives/Cargo.toml
View File

@ -10,4 +10,4 @@ description = "core reth specific revm utilities"
# reth
reth-primitives = { path = "../../primitives" }
revm = { version = "3.0.0" }
revm = { version = "3.0.0" }

4
crates/rlp/Cargo.toml
View File

@ -12,7 +12,7 @@ auto_impl = "1"
bytes = { version = "1", default-features = false }
ethnum = { version = "1", default-features = false, optional = true }
smol_str = { version = "0.1", default-features = false, optional = true }
enr = { version = "0.7", default-features = false, optional = true }
enr = { version = "0.8.0", default-features = false, optional = true }
rlp = { version = "0.5.2", default-features = false, optional = true }
ethereum-types = { version = "0.14", features = ["codec"], optional = true }
revm-primitives = {version = "1.0.0", features = ["serde"] }
@ -30,7 +30,7 @@ reth-rlp = { path = ".", package = "reth-rlp", features = [
criterion = "0.4.0"
hex-literal = "0.3"
rand = "0.8"
secp256k1 = { version = "0.24", features = [
secp256k1 = { version = "0.26.0", features = [
"rand-std",
] }
pprof = { version = "0.11", features = ["flamegraph", "frame-pointer", "criterion"] }

4
crates/staged-sync/Cargo.toml
View File

@ -44,7 +44,7 @@ rand = { version = "0.8", optional = true }
thiserror = "1"
# enr
enr = { version = "0.7.0", features = ["serde", "rust-secp256k1"], optional = true }
enr = { version = "0.8.0", features = ["serde", "rust-secp256k1"], optional = true }
# ethers
ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false, optional = true }
@ -74,7 +74,7 @@ tokio = { version = "1", features = ["io-util", "net", "macros", "rt-multi-threa
tokio-stream = "0.1"
# crypto
secp256k1 = { version = "0.24", features = [
secp256k1 = { version = "0.26.0", features = [
"global-context",
"rand-std",
"recovery",

4
crates/storage/db/Cargo.toml
View File

@ -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.24.2", default-features = false, features = [
secp256k1 = { version = "0.26.0", default-features = false, features = [
"alloc",
"recovery",
"rand",
@ -59,7 +59,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.24.2"
secp256k1 = "0.26.0"
async-trait = "0.1.58"