Skip to content

Commit 69e1904

Browse files
vlad9486vlad9486
committed
update libp2p and other deps
1 parent f267f77 commit 69e1904

File tree

10 files changed

+942
-724
lines changed

10 files changed

+942
-724
lines changed

‎Cargo.lock

Lines changed: 887 additions & 665 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bpf-recorder/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ required-features = ["user"]
2222

2323
[dependencies]
2424
ebpf-kern = { git = "https://github.com/vlad9486/ebpf-tools", optional = true }
25-
typenum = { version = "1.15", optional = true }
25+
typenum = { version = "1.17", optional = true }
2626
ebpf-user = { git = "https://github.com/vlad9486/ebpf-tools", optional = true }
27-
ctrlc = { version = "3.2", optional = true }
28-
log = { version = "0.4.17", optional = true }
29-
env_logger = { version = "0.10.0", default-features = false, optional = true }
27+
ctrlc = { version = "3.4.4", optional = true }
28+
log = { version = "0.4.22", optional = true }
29+
env_logger = { version = "0.11.3", default-features = false, optional = true }
3030
hex = { version = "0.4.3", optional = true }
31-
libbpf-sys = { version = "1.0.4", optional = true }
32-
libc = { version = "0.2.138", optional = true }
31+
libbpf-sys = { version = "1.4.2", optional = true }
32+
libc = { version = "0.2.155", optional = true }
3333
network-types = { version = "0.0.4", optional = true }
3434

3535
serde = { version = "1.0", optional = true }
3636
serde_json = { version = "1.0", optional = true }
37-
reqwest = { version = "0.11.14", features = ["blocking"], optional = true }
37+
reqwest = { version = "0.12.5", features = ["blocking"], optional = true }
3838

3939
# local
4040
bpf-ring-buffer = { version = "=0.1.0", path = "../bpf-ring-buffer", optional = true }

‎bpf-ring-buffer/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ rust-version = "1.58.1"
77
license = "MIT"
88

99
[dependencies]
10-
libc = "0.2.137"
11-
log = "0.4.17"
10+
libc = "0.2.155"
11+
log = "0.4.22"
1212
epoll = { version = "4.3" }

‎mina-aggregator/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ license = "MIT"
99
[dependencies]
1010
# reqwest = { version = "0.11.13", features = ["blocking"] }
1111
# url = { version = "2.3.1" }
12-
env_logger = { version = "0.10.0", default-features = false }
13-
ctrlc = { version = "3.2" }
12+
env_logger = { version = "0.11.3", default-features = false }
13+
ctrlc = { version = "3.4.4" }
1414

15-
tokio = { version = "1.22", features = ["rt-multi-thread"] }
16-
warp = { version = "0.3.3", features = ["tls"] }
17-
log = { version = "0.4.17" }
15+
tokio = { version = "1.38.0", features = ["rt-multi-thread"] }
16+
warp = { version = "0.3.7", features = ["tls"] }
17+
log = { version = "0.4.22" }
1818
thiserror = { version = "1.0" }
1919

2020
rocksdb = { version = "0.21.0", default-features = false }
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = { version = "1.0", features = ["preserve_order"] }
2323
radiation = { git = "https://github.com/vlad9486/radiation" }
2424

25-
libp2p-core = { version = "0.38.0" }
25+
libp2p-core = { version = "0.41.3", features = ["serde"] }
2626
# dns-lookup = { version = "1.0" }
2727

2828
mina-recorder = { path = "../mina-recorder" }

‎mina-recorder/Cargo.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ name = "mina-viewer"
1111
path = "src/bin/mina-viewer.rs"
1212

1313
[build-dependencies]
14-
prost-build = { version = "0.11.3" }
14+
prost-build = { version = "0.11.9" }
1515
capnpc = { version = "0.15.1" }
1616

1717
[dependencies]
18-
log = { version = "0.4.17" }
18+
log = { version = "0.4.22" }
1919
hex = { version = "0.4.3" }
20-
base64 = { version = "0.20.0" }
21-
time = { version = "0.3.17", features = ["formatting"] }
22-
unsigned-varint = { version = "0.7.1" }
23-
multiaddr = { version = "0.16.0" }
20+
base64 = { version = "0.22.1" }
21+
time = { version = "0.3.36", features = ["formatting"] }
22+
unsigned-varint = { version = "0.8.0" }
23+
multiaddr = { version = "0.18.1" }
2424
strace-parse = { git = "https://github.com/openmina/strace-parse.rs.git" }
2525
bitflags = { version = "1.3" }
2626

27-
prost = { version = "0.11.3" }
27+
prost = { version = "0.13.1" }
2828
mina-p2p-messages = { git = "https://github.com/openmina/openmina.git", rev = "6fb148ba06153a6497173e62bae1a67323fe5f92" }
2929
capnp = { version = "0.15.2" }
3030

3131
salsa20 = { version = "0.10.2" }
32-
blake2 = { version = "0.10.5" }
32+
blake2 = { version = "0.10.6" }
3333
curve25519-dalek = { version = "3.2" }
34-
sha2 = { version = "0.10.6" }
34+
sha2 = { version = "0.10.8" }
3535
chacha20poly1305 = { version = "0.10.1" }
3636
vru-noise = { version = "1.5" }
3737

@@ -40,20 +40,20 @@ radiation = { git = "https://github.com/vlad9486/radiation" }
4040
thiserror = { version = "1.0" }
4141
serde = { version = "1.0", features = ["derive"] }
4242
serde_json = { version = "1.0", features = ["preserve_order"] }
43-
itertools = { version = "0.10.5" }
44-
parking_lot = { version = "0.12.1" }
43+
itertools = { version = "0.13.0" }
44+
parking_lot = { version = "0.12.3" }
4545

46-
tokio = { version = "1.22", features = ["rt-multi-thread"] }
47-
warp = { version = "0.3.3", features = ["tls"] }
48-
reqwest = { version = "0.11.13", features = ["blocking"] }
46+
tokio = { version = "1.38", features = ["rt-multi-thread"] }
47+
warp = { version = "0.3.7", features = ["tls"] }
48+
reqwest = { version = "0.12.5", features = ["blocking"] }
4949

50-
libp2p-core = { version = "0.38.0", features = ["secp256k1", "ecdsa", "serde"] }
51-
# ed25519-dalek = { version = "*" }
50+
libp2p-core = { version = "0.41.3", features = ["serde"] }
51+
libp2p-identity = { version = "0.2.9", features = ["ed25519", "secp256k1", "ecdsa"] }
5252

53-
pete = { version = "0.9.0" }
53+
pete = { version = "0.12.0" }
5454

5555
ebpf-user = { git = "https://github.com/vlad9486/ebpf-tools" }
56-
libbpf-sys = { version = "1.0.4" }
56+
libbpf-sys = { version = "1.4.2" }
5757

5858
[dev-dependencies]
59-
temp-dir = "0.1.11"
59+
temp-dir = "0.1.13"

‎mina-recorder/src/decode/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub enum DecodeError {
3939
#[error("RSA key not supported")]
4040
Rsa,
4141
#[error("{0}")]
42-
IdentityDecoding(#[from] libp2p_core::identity::error::DecodingError),
42+
IdentityDecoding(#[from] libp2p_identity::DecodingError),
4343
}
4444

4545
impl<'pa> From<nom::Err<ParseError<&'pa [u8]>>> for DecodeError {

‎mina-recorder/src/decode/noise.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ use prost::{bytes::Bytes, Message};
22
use radiation::{Absorb, AbsorbExt, ParseError};
33
use serde::Serialize;
44

5-
use libp2p_core::{
6-
PublicKey, PeerId,
7-
identity::{ed25519, secp256k1, ecdsa},
8-
};
5+
use libp2p_identity::{PeerId, ed25519, secp256k1, ecdsa};
96

107
use super::{DecodeError, MessageType};
118

@@ -68,14 +65,12 @@ pub fn parse(bytes: Vec<u8>, _: bool) -> Result<serde_json::Value, DecodeError>
6865
let libp2p_pk = match pk.r#type() {
6966
keys_proto::KeyType::Rsa => return Err(DecodeError::Rsa),
7067
keys_proto::KeyType::Ed25519 => {
71-
PublicKey::Ed25519(ed25519::PublicKey::decode(&pk.data)?)
68+
ed25519::PublicKey::try_from_bytes(&pk.data)?.into()
7269
}
7370
keys_proto::KeyType::Secp256k1 => {
74-
PublicKey::Secp256k1(secp256k1::PublicKey::decode(&pk.data)?)
75-
}
76-
keys_proto::KeyType::Ecdsa => {
77-
PublicKey::Ecdsa(ecdsa::PublicKey::from_bytes(&pk.data)?)
71+
secp256k1::PublicKey::try_from_bytes(&pk.data)?.into()
7872
}
73+
keys_proto::KeyType::Ecdsa => ecdsa::PublicKey::try_from_bytes(&pk.data)?.into(),
7974
};
8075
let id = PeerId::from_public_key(&libp2p_pk);
8176
(

‎simulator/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ edition = "2021"
66
[dependencies]
77
# system
88
structopt = { version = "0.3.26" }
9-
env_logger = { version = "0.10.0" }
9+
env_logger = { version = "0.11.3", default-features = false }
1010
anyhow = { version = "1.0" }
11-
signal-hook = { version = "0.3.15" }
12-
nix = { version = "0.26.2" }
11+
signal-hook = { version = "0.3.17" }
12+
nix = { version = "0.28.0" }
1313

1414
# utils
15-
log = { version = "0.4.17" }
15+
log = { version = "0.4.22" }
1616
hex = { version = "0.4.3" }
17-
roxmltree = { version = "0.18.0" }
18-
time = { version = "0.3.20", features = ["parsing", "formatting"] }
17+
roxmltree = { version = "0.20.0" }
18+
time = { version = "0.3.36", features = ["parsing", "formatting"] }
1919
rand = { version = "0.8.5" }
2020

2121
# graph
22-
petgraph = { version = "0.6.3" }
22+
petgraph = { version = "0.6.5" }
2323

2424
# http
2525
serde = { version = "1.0" }
2626
serde_json = { version = "1.0", features = ["preserve_order"] }
27-
tokio = { version = "1.26", features = ["rt-multi-thread"] }
28-
warp = { version = "0.3.3" }
29-
reqwest = { version = "0.11.14", features = ["blocking"] }
27+
tokio = { version = "1.38.0", features = ["rt-multi-thread"] }
28+
warp = { version = "0.3.7" }
29+
reqwest = { version = "0.12.5", features = ["blocking"] }
3030

3131
# mina
3232
mina-ipc = { path = "../mina-ipc" }

‎simulator/src/peer/tests.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ pub fn test_order(client: &Client) -> DbTestOrderReport {
305305

306306
pub fn test_events(events: Vec<DbEventWithMetadata>, peer_id: String) -> DbTestEventsReport {
307307
#[derive(Clone, Deserialize)]
308+
#[allow(dead_code)]
308309
pub struct BlockStat {
309310
pub height: u32,
310311
pub events: Vec<BlockNetworkEvent>,

‎topology-tool/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ edition = "2021"
55

66
[dependencies]
77
structopt = { version = "0.3.26" }
8-
env_logger = { version = "0.10.0" }
8+
env_logger = { version = "0.11.3", default-features = false }
99
anyhow = { version = "1.0" }
10-
time = { version = "0.3.20", features = ["parsing", "formatting"] }
10+
time = { version = "0.3.36", features = ["parsing", "formatting"] }
1111

12-
log = { version = "0.4.17" }
13-
reqwest = { version = "0.11.14", features = ["blocking"] }
12+
log = { version = "0.4.22" }
13+
reqwest = { version = "0.12.5", features = ["blocking"] }
1414
serde = { version = "1.0", features = ["derive"] }
1515
serde_json = { version = "1.0" }
16-
petgraph = { version = "0.6.3" }
16+
petgraph = { version = "0.6.5" }

0 commit comments

Comments
 (0)