MAGICGrants/cuprate-for-explorer
1
0
Fork 0
mirror of https://github.com/MAGICGrants/cuprate-for-explorer.git synced 2026-01-08 19:27:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update deps (#527)

Browse Source 
* fix clippy

* update deps

* fix ci
This commit is contained in:
Boog900
2025-08-12 22:43:47 +01:00
committed by GitHub
parent db20a19d02
commit 27a97ab106
9 changed files with 714 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1325
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

35
Cargo.toml
View File

@@ -163,11 +163,11 @@ cuprate-rpc-interface = { path = "rpc/interface", default-featur
cuprate-zmq-types = { path = "zmq/types", default-features = false }
# External dependencies
axum = { version = "0.7", default-features = false }
axum = { version = "0.8", default-features = false }
anyhow = { version = "1", default-features = false }
arc-swap = { version = "1", default-features = false }
arrayvec = { version = "0.7", default-features = false }
arti-client = { version = "0.32", default-features = false }
arti-client = { version = "0.33", default-features = false }
async-trait = { version = "0.1", default-features = false }
bitflags = { version = "2", default-features = false }
blake3 = { version = "1", default-features = false }
@@ -177,15 +177,15 @@ bytes = { version = "1", default-features = false }
cfg-if = { version = "1", default-features = false }
clap = { version = "4", default-features = false }
chrono = { version = "0.4", default-features = false }
crypto-bigint = { version = "0.5", default-features = false }
crypto-bigint = { version = "0.6", default-features = false }
crossbeam = { version = "0.8", default-features = false }
const_format = { version = "0.2", default-features = false }
curve25519-dalek = { version = "4", default-features = false }
dashmap = { version = "6", default-features = false }
dirs = { version = "5", default-features = false }
dirs = { version = "6", default-features = false }
futures = { version = "0.3", default-features = false }
hex = { version = "0.4", default-features = false }
hex-literal = { version = "0.4", default-features = false }
hex-literal = { version = "1", default-features = false }
indexmap = { version = "2", default-features = false }
monero-address = { git = "https://github.com/Cuprate/serai.git", rev = "e6ae8c2", default-features = false }
monero-serai = { git = "https://github.com/Cuprate/serai.git", rev = "e6ae8c2", default-features = false }
@@ -196,26 +196,27 @@ randomx-rs = { git = "https://github.com/Cuprate/randomx-rs.git", rev
rand = { version = "0.8", default-features = false }
rand_distr = { version = "0.4", default-features = false }
rayon = { version = "1", default-features = false }
safelog = { version = "0.4", default-features = false }
serde_bytes = { version = "0.11", default-features = false }
serde_json = { version = "1", default-features = false }
serde = { version = "1", default-features = false }
strum = { version = "0.26", default-features = false }
thiserror = { version = "1", default-features = false }
strum = { version = "0.27", default-features = false }
thiserror = { version = "2", default-features = false }
thread_local = { version = "1", default-features = false }
tokio-util = { version = "0.7", default-features = false }
tokio-stream = { version = "0.1", default-features = false }
tokio-socks = { git = "https://github.com/Cuprate/tokio-socks.git", rev = "8737caf", default-features = false }
tokio = { version = "1", default-features = false }
tower = { git = "https://github.com/Cuprate/tower.git", rev = "6c7faf0", default-features = false } # <https://github.com/tower-rs/tower/pull/796>
tower = { version = "0.5", default-features = false }
tower-http = { version = "0.6", default-features = false }
toml = { version = "0.8", default-features = false }
toml_edit = { version = "0.22", default-features = false }
tor-cell = { version = "0.32", default-features = false }
tor-config-path = { version = "0.32", default-features = false }
tor-hsservice = { version = "0.32", default-features = false }
tor-persist = { version = "0.32", default-features = false }
tor-proto = { version = "0.32", default-features = false }
tor-rtcompat = { version = "0.32", default-features = false }
toml = { version = "0.9", default-features = false }
toml_edit = { version = "0.23", default-features = false }
tor-cell = { version = "0.33", default-features = false }
tor-config-path = { version = "0.33", default-features = false }
tor-hsservice = { version = "0.33", default-features = false }
tor-persist = { version = "0.33", default-features = false }
tor-proto = { version = "0.33", default-features = false }
tor-rtcompat = { version = "0.33", default-features = false }
tracing-appender = { version = "0.2", default-features = false }
tracing-subscriber = { version = "0.3", default-features = false }
tracing = { version = "0.1", default-features = false }
@@ -226,7 +227,7 @@ monero-simple-request-rpc = { git = "https://github.com/Cuprate/serai.git", rev
tempfile = { version = "3" }
pretty_assertions = { version = "1" }
proptest = { version = "1" }
proptest-derive = { version = "0.5" }
proptest-derive = { version = "0.6" }
tokio-test = { version = "0.4" }
arbitrary = { version = "1" }

5
binaries/cuprated/Cargo.toml
View File

@@ -70,6 +70,7 @@ randomx-rs = { workspace = true }
rand = { workspace = true }
rand_distr = { workspace = true }
rayon = { workspace = true }
safelog = { workspace = true }
serde_bytes = { workspace = true }
serde_json = { workspace = true }
serde = { workspace = true }
@@ -79,8 +80,8 @@ thread_local = { workspace = true }
tokio-util = { workspace = true, features = ["rt"] }
tokio-stream = { workspace = true }
tokio = { workspace = true }
toml = { workspace = true, features = ["parse", "display"]}
toml_edit = { workspace = true }
toml = { workspace = true, features = ["parse", "display", "serde"]}
toml_edit = { workspace = true, features = ["parse", "display"] }
tor-hsservice = { workspace = true }
tor-persist = { workspace = true }
tor-rtcompat = { workspace = true }

2
binaries/cuprated/src/config.rs
View File

@@ -10,6 +10,7 @@ use std::{
use arti_client::KeystoreSelector;
use clap::Parser;
use safelog::DisplayRedacted;
use serde::{Deserialize, Serialize};
use cuprate_consensus::ContextConfig;
@@ -253,6 +254,7 @@ impl Config {
.unwrap()
.generate_identity_key(KeystoreSelector::Primary)
.unwrap()
.display_unredacted()
.to_string();
OnionAddr::new(&addr, self.p2p.tor_net.p2p_port).unwrap()

1
p2p/p2p-core/src/client/handshaker.rs
View File

@@ -492,7 +492,6 @@ where
};
let protocol_request_handler = protocol_request_svc_maker
.as_service()
.ready()
.await?
.call(info.clone())

14
p2p/p2p-core/src/lib.rs
View File

@@ -280,11 +280,10 @@ impl<T> ProtocolRequestHandler for T where
}
pub trait ProtocolRequestHandlerMaker<Z: NetworkZone>:
tower::MakeService<
tower::Service<
client::PeerInformation<Z::Addr>,
ProtocolRequest,
MakeError = tower::BoxError,
Service: ProtocolRequestHandler,
Error = tower::BoxError,
Response: ProtocolRequestHandler,
Future: Send + 'static,
> + Send
+ 'static
@@ -292,11 +291,10 @@ pub trait ProtocolRequestHandlerMaker<Z: NetworkZone>:
}
impl<T, Z: NetworkZone> ProtocolRequestHandlerMaker<Z> for T where
T: tower::MakeService<
T: tower::Service<
client::PeerInformation<Z::Addr>,
ProtocolRequest,
MakeError = tower::BoxError,
Service: ProtocolRequestHandler,
Error = tower::BoxError,
Response: ProtocolRequestHandler,
Future: Send + 'static,
> + Send
+ 'static

2
p2p/p2p-transport/Cargo.toml
View File

@@ -25,7 +25,5 @@ tor-hsservice = { workspace = true }
tor-proto = { workspace = true }
tor-rtcompat = { workspace = true }
tracing = { workspace = true }
[lints]
workspace = true

6
p2p/p2p-transport/src/arti.rs
View File

@@ -135,12 +135,6 @@ impl Transport<Tor> for Arti {
async fn incoming_connection_listener(
config: Self::ServerConfig,
) -> Result<Self::Listener, io::Error> {
tracing::info!(
"Listening for incoming Tor P2P connections on address: {}:{}",
config.onion_svc.onion_address().unwrap(),
config.port
);
// Launch onion service
#[expect(clippy::clone_on_ref_ptr)]
let (svc, rdv_stream) = config

2
rpc/interface/Cargo.toml
View File

@@ -28,7 +28,7 @@ futures = { workspace = true, optional = true }
[dev-dependencies]
cuprate-test-utils = { workspace = true }
axum = { version = "0.7.5", features = ["json", "tokio", "http2"] }
axum = { workspace = true, features = ["json", "tokio", "http2"] }
serde_json = { workspace = true, features = ["std"] }
tokio = { workspace = true, features = ["full"] }
ureq = { version = "2.10.1", features = ["json"] }