From 3ab512a4fd91f83a8302ee7afedf9d43db6fe80d Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Thu, 18 Apr 2024 11:34:18 +0200 Subject: [PATCH 01/26] Change/remove `backoff::retry()` usage in runner --- clients/runner/src/runner.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index b38210892..b381ad978 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -612,11 +612,9 @@ pub fn retry_with_log(mut f: F, log_msg: String) -> Result where F: FnMut() -> Result, { - retry(custom_retry_config(), || { - f().map_err(|e| { - log::info!("{}: {}. Retrying...", log_msg, e.to_string()); - BackoffError::Transient(e) - }) + f().map_err(|e| { + log::info!("{}: {}. Retrying...", log_msg, e.to_string()); + BackoffError::Transient(e) }) .map_err(Into::into) } @@ -626,14 +624,12 @@ where F: Fn() -> BoxFuture<'a, Result>, E: Into + Sized + Display, { - backoff::future::retry(custom_retry_config(), || async { - f().await.map_err(|e| { + f().await + .map_err(|e| { log::info!("{}: {}. Retrying...", log_msg, e.to_string()); BackoffError::Transient(e) }) - }) - .await - .map_err(Into::into) + .map_err(Into::into) } #[cfg(test)] From 2e6cbc49673cd652f572d1d7664c37bc09252b00 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Thu, 2 May 2024 18:36:56 +0200 Subject: [PATCH 02/26] Remove `backoff` from error.rs --- clients/runner/src/error.rs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/clients/runner/src/error.rs b/clients/runner/src/error.rs index 1b7645a6b..2e9e7cab3 100644 --- a/clients/runner/src/error.rs +++ b/clients/runner/src/error.rs @@ -1,6 +1,5 @@ #![allow(clippy::enum_variant_names)] -use backoff::Error as BackoffError; use codec::Error as CodecError; use nix::Error as OsError; use reqwest::Error as ReqwestError; @@ -38,12 +37,3 @@ pub enum Error { #[error("Incorrect Checksum")] IncorrectChecksum, } - -impl + Sized> From> for Error { - fn from(e: BackoffError) -> Self { - match e { - BackoffError::Permanent(err) => err.into(), - BackoffError::Transient(err) => err.into(), - } - } -} From 8132db0d48b0390543b8c0ce53bdba467cc04ec6 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Thu, 2 May 2024 19:20:32 +0200 Subject: [PATCH 03/26] Manually implement backoff behaviour --- Cargo.lock | 11 ++++++- clients/runner/Cargo.toml | 6 ++-- clients/runner/src/runner.rs | 58 +++++++++++++++++++++++------------- 3 files changed, 51 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9fe4d5a68..f822fc0e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2311,6 +2311,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "exponential-backoff" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47f78d87d930eee4b5686a2ab032de499c72bd1e954b84262bb03492a0f932cd" +dependencies = [ + "rand 0.8.5", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -7296,10 +7305,10 @@ name = "runner" version = "1.0.7" dependencies = [ "async-trait", - "backoff", "bytes", "clap 4.3.19", "env_logger 0.7.1", + "exponential-backoff", "futures 0.3.28", "hex", "log", diff --git a/clients/runner/Cargo.toml b/clients/runner/Cargo.toml index 0b84570ff..d93ab6a6d 100644 --- a/clients/runner/Cargo.toml +++ b/clients/runner/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] -clap = { version = "4.0.17", features = ["derive"]} +clap = { version = "4.0.17", features = ["derive"] } hex = "0.4.3" tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } @@ -22,8 +22,8 @@ bytes = "1.1.0" signal-hook = "0.3.14" signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"] } futures = "0.3.21" -backoff = { version = "0.3.0", features = ["tokio"] } -subxt = { version = "0.29.0", default_features = false, features = ["jsonrpsee-ws"] } +exponential-backoff = "1.2.0" +subxt = { version = "0.29.0", default_features = false, features = ["jsonrpsee-ws"] } sha2 = "0.8.2" [dev-dependencies] diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index b381ad978..80a765bf0 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -1,5 +1,4 @@ use crate::{error::Error, Opts}; -use backoff::{retry, Error as BackoffError, ExponentialBackoff}; use bytes::Bytes; use codec::Decode; use futures::{future::BoxFuture, FutureExt, StreamExt, TryFutureExt}; @@ -71,7 +70,7 @@ pub const RETRY_TIMEOUT: Duration = Duration::from_millis(60_000); pub const RETRY_INTERVAL: Duration = Duration::from_millis(1_000); /// Multiplier for the interval in retry utilities: Constant interval retry -pub const RETRY_MULTIPLIER: f64 = 1.0; +pub const RETRY_MULTIPLIER: u32 = 1; /// Data type assumed to be used by the parachain to store the client release. /// If this type is different from the on-chain one, decoding will fail. @@ -599,24 +598,33 @@ pub async fn subxt_api(url: &str) -> Result, Error> Ok(OnlineClient::from_url(url).await?) } -pub fn custom_retry_config() -> ExponentialBackoff { - ExponentialBackoff { - initial_interval: RETRY_INTERVAL, - max_elapsed_time: Some(RETRY_TIMEOUT), - multiplier: RETRY_MULTIPLIER, - ..ExponentialBackoff::default() - } +fn create_backoff_strategy() -> exponential_backoff::Backoff { + let mut backoff = exponential_backoff::Backoff::new(u32::MAX, RETRY_INTERVAL, RETRY_TIMEOUT); + backoff.set_factor(RETRY_MULTIPLIER); + backoff.set_jitter(0.3); + backoff } pub fn retry_with_log(mut f: F, log_msg: String) -> Result where F: FnMut() -> Result, { - f().map_err(|e| { - log::info!("{}: {}. Retrying...", log_msg, e.to_string()); - BackoffError::Transient(e) - }) - .map_err(Into::into) + let backoff = create_backoff_strategy(); + + // We store the error to return it if the backoff is exhausted + let mut error = None; + while let Some(duration) = backoff.iter().next() { + match f() { + Ok(result) => return Ok(result), + Err(err) => { + log::info!("{}: {}. Retrying...", log_msg, err.to_string()); + std::thread::sleep(duration); + error = Some(err) + }, + } + } + + Err(error.expect("Error should not be None if we reach here.")) } pub async fn retry_with_log_async<'a, T, F, E>(f: F, log_msg: String) -> Result @@ -624,12 +632,22 @@ where F: Fn() -> BoxFuture<'a, Result>, E: Into + Sized + Display, { - f().await - .map_err(|e| { - log::info!("{}: {}. Retrying...", log_msg, e.to_string()); - BackoffError::Transient(e) - }) - .map_err(Into::into) + let backoff = create_backoff_strategy(); + + // We store the error to return it if the backoff is exhausted + let mut error = None; + while let Some(duration) = backoff.iter().next() { + match f().await { + Ok(result) => return Ok(result), + Err(err) => { + log::info!("{}: {}. Retrying...", log_msg, err.to_string()); + tokio::time::sleep(duration).await; + error = Some(err) + }, + } + } + + Err(error.expect("Error should not be None if we reach here.").into()) } #[cfg(test)] From 88c108e1bb334b45c2b4225e48fa9ffea88739c5 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Tue, 7 May 2024 17:54:28 +0200 Subject: [PATCH 04/26] Fix build error --- Cargo.lock | 2762 ++++++++++++++++++++++++++++++---------------------- Cargo.toml | 4 + 2 files changed, 1585 insertions(+), 1181 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f822fc0e9..eb0debe30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,11 +23,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.27.3", + "gimli 0.28.1", ] [[package]] @@ -85,14 +85,14 @@ dependencies = [ "cfg-if 1.0.0", "cipher 0.3.0", "cpufeatures", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if 1.0.0", "cipher 0.4.4", @@ -115,15 +115,15 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead 0.5.2", - "aes 0.8.3", + "aes 0.8.4", "cipher 0.4.4", "ctr 0.9.2", - "ghash 0.5.0", + "ghash 0.5.1", "subtle", ] @@ -134,7 +134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" dependencies = [ "cipher 0.2.5", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] @@ -144,46 +144,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" dependencies = [ "cipher 0.2.5", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +version = "0.8.11" +source = "git+https://github.com/tkaitchuck/aHash?rev=db36e4c4f0606b786bc617eefaffbe4ae9100762#db36e4c4f0606b786bc617eefaffbe4ae9100762" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.10", + "getrandom 0.2.15", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -211,58 +211,58 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "approx" @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "array-bytes" @@ -316,7 +316,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.23", + "time", ] [[package]] @@ -332,7 +332,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.23", + "time", ] [[package]] @@ -399,36 +399,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +dependencies = [ + "concurrent-queue", + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", "futures-core", + "pin-project-lite 0.2.14", ] [[package]] name = "async-executor" -version = "1.6.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock", "async-task", "concurrent-queue", - "fastrand 2.0.0", - "futures-lite", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] [[package]] name = "async-global-executor" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel", + "async-channel 2.2.1", "async-executor", - "async-io", - "async-lock", + "async-io 2.3.2", + "async-lock 3.3.0", "blocking", - "futures-lite", + "futures-lite 2.3.0", "once_cell", ] @@ -438,27 +450,57 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if 1.0.0", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix 0.37.23", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.0", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite 0.2.14", ] [[package]] @@ -468,21 +510,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-attributes", - "async-channel", + "async-channel 1.9.0", "async-global-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", "memchr", "once_cell", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", "pin-utils", "slab", "wasm-bindgen-futures", @@ -490,19 +532,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -515,14 +557,14 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", ] [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atty" @@ -537,9 +579,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backoff" @@ -548,7 +590,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fe17f59a06fe8b87a6fc8bf53bb70b3aba76d7685f432487a68cd5552853625" dependencies = [ "futures-core", - "getrandom 0.2.10", + "getrandom 0.2.15", "instant", "pin-project", "rand 0.8.5", @@ -557,16 +599,16 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ - "addr2line 0.20.0", + "addr2line 0.21.0", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.31.1", + "object 0.32.2", "rustc-demangle", ] @@ -602,9 +644,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -658,9 +700,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitvec" @@ -685,37 +727,37 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.2.6", + "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f" +checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.2.6", + "constant_time_eq", ] [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", "cfg-if 1.0.0", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -775,25 +817,23 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.4.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.2.1", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.0", "futures-io", - "futures-lite", + "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "bounded-collections" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6" +checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd" dependencies = [ "log", "parity-scale-codec", @@ -809,9 +849,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.6.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -834,9 +874,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -852,21 +892,21 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2-sys" @@ -885,12 +925,12 @@ version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69b0116662497bc24e4b177c90eaf8870e39e2714c3fcfa296327a93f593fc21" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.11", "async-trait", "cached_proc_macro", "cached_proc_macro_types", - "futures 0.3.28", - "hashbrown 0.14.0", + "futures 0.3.30", + "hashbrown 0.14.5", "instant", "once_cell", "thiserror", @@ -911,9 +951,9 @@ dependencies = [ [[package]] name = "cached_proc_macro_types" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" +checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "camino" @@ -926,9 +966,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -941,7 +981,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.18", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -949,11 +989,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", + "libc", + "once_cell", ] [[package]] @@ -1005,43 +1047,41 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chacha20" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if 1.0.0", - "cipher 0.3.0", + "cipher 0.4.4", "cpufeatures", - "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead 0.4.3", + "aead 0.5.2", "chacha20", - "cipher 0.3.0", + "cipher 0.4.4", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.43", "wasm-bindgen", - "winapi", + "windows-targets 0.52.5", ] [[package]] @@ -1083,13 +1123,14 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", + "zeroize", ] [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -1108,32 +1149,31 @@ dependencies = [ "clap_lex 0.2.4", "indexmap 1.9.3", "once_cell", - "strsim", + "strsim 0.10.0", "termcolor", "textwrap", ] [[package]] name = "clap" -version = "4.3.19" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", - "clap_derive 4.3.12", - "once_cell", + "clap_derive 4.5.4", ] [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.0", - "strsim", + "clap_lex 0.7.0", + "strsim 0.11.1", ] [[package]] @@ -1142,7 +1182,7 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -1151,14 +1191,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -1172,9 +1212,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clients-info" @@ -1205,9 +1245,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "comfy-table" @@ -1222,24 +1262,18 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" - -[[package]] -name = "constant_time_eq" -version = "0.2.6" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" @@ -1255,9 +1289,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1265,9 +1299,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -1289,9 +1323,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1397,60 +1431,52 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1598,23 +1624,37 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if 1.0.0", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", - "packed_simd_2", - "platforms 3.0.2", + "platforms 3.4.0", + "rustc_version", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "cxx" -version = "1.0.102" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68e12e817cb19eaab81aaec582b4052d07debd3c3c6b083b9d361db47c7dc9d" +checksum = "21db378d04296a84d8b7d047c36bb3954f0b46529db725d7e62fb02f9ba53ccc" dependencies = [ "cc", "cxxbridge-flags", @@ -1624,9 +1664,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.102" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e789217e4ab7cf8cc9ce82253180a9fe331f35f5d339f0ccfe0270b39433f397" +checksum = "3e5262a7fa3f0bae2a55b767c223ba98032d7c328f5c13fa5cdc980b77fc0658" dependencies = [ "cc", "codespan-reporting", @@ -1634,24 +1674,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] name = "cxxbridge-flags" -version = "1.0.102" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a19f4c80fd9ab6c882286fa865e92e07688f4387370a209508014ead8751d0" +checksum = "be8dcadd2e2fb4a501e1d9e93d6e88e6ea494306d8272069c92d5a9edf8855c0" [[package]] name = "cxxbridge-macro" -version = "1.0.102" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fcfa71f66c8563c4fa9dd2bb68368d50267856f831ac5d85367e0805f9606c" +checksum = "ad08a837629ad949b73d032c637653d069e909cffe4ee7870b02301939ce39cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -1666,12 +1706,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.8", + "darling_macro 0.20.8", ] [[package]] @@ -1684,22 +1724,22 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.27", + "strsim 0.10.0", + "syn 2.0.61", ] [[package]] @@ -1715,39 +1755,39 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.8", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.0", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.10", ] [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-encoding-macro" -version = "0.1.13" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" +checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -1755,9 +1795,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" +checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" dependencies = [ "data-encoding", "syn 1.0.109", @@ -1776,9 +1816,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -1812,6 +1852,16 @@ dependencies = [ "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + [[package]] name = "derivative" version = "2.2.0" @@ -1881,7 +1931,7 @@ dependencies = [ [[package]] name = "dia-oracle" version = "0.1.0" -source = "git+https://github.com/pendulum-chain/oracle-pallet?branch=polkadot-v0.9.42#9fda7904283d3687581392505d01a9bfd61099bc" +source = "git+https://github.com/pendulum-chain/oracle-pallet?branch=polkadot-v0.9.42#79ab575220f3c59935e0e4ff73124604c9aeac6d" dependencies = [ "frame-benchmarking", "frame-support", @@ -1993,7 +2043,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -2016,9 +2066,9 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dtoa" @@ -2049,9 +2099,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.12" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" @@ -2071,9 +2121,9 @@ version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.8", + "der 0.7.9", "digest 0.10.7", - "elliptic-curve 0.13.7", + "elliptic-curve 0.13.8", "rfc6979 0.4.0", "signature 2.2.0", "spki 0.7.3", @@ -2088,6 +2138,16 @@ dependencies = [ "signature 1.6.4", ] +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8 0.10.2", + "signature 2.2.0", +] + [[package]] name = "ed25519-dalek" version = "1.0.1" @@ -2095,13 +2155,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek 3.2.0", - "ed25519", + "ed25519 1.5.3", "rand 0.7.3", "serde", "sha2 0.9.9", "zeroize", ] +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek 4.1.2", + "ed25519 2.2.3", + "rand_core 0.6.4", + "serde", + "sha2 0.10.8", + "subtle", + "zeroize", +] + [[package]] name = "ed25519-zebra" version = "3.1.0" @@ -2118,9 +2193,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elliptic-curve" @@ -2146,9 +2221,9 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.7" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9775b22bc152ad86a0cf23f0f348b884b26add12bf741e7ffc4d4ab2ab4d205" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct 0.2.0", "crypto-bigint 0.5.5", @@ -2165,9 +2240,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] @@ -2178,7 +2253,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -2225,9 +2300,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime 2.1.0", "is-terminal", @@ -2264,30 +2339,61 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ - "cc", - "libc", + "concurrent-queue", + "parking", + "pin-project-lite 0.2.14", ] [[package]] name = "event-listener" -version = "2.5.3" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite 0.2.14", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite 0.2.14", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite 0.2.14", +] [[package]] name = "exit-future" @@ -2295,7 +2401,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", ] [[package]] @@ -2343,9 +2449,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdlimit" @@ -2408,9 +2514,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" [[package]] name = "file-per-thread-logger" @@ -2418,20 +2524,20 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger 0.10.0", + "env_logger 0.10.2", "log", ] [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2441,12 +2547,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36530797b9bf31cd4ff126dcfee8170f86b00cfdcea3269d73133cc0415945c3" dependencies = [ "either", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "scale-info", ] @@ -2480,9 +2586,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "libz-sys", @@ -2538,11 +2644,11 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding 2.3.1", ] [[package]] @@ -2593,7 +2699,7 @@ dependencies = [ "Inflector", "array-bytes", "chrono", - "clap 4.3.19", + "clap 4.5.4", "comfy-table", "frame-benchmarking", "frame-support", @@ -2706,7 +2812,7 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -2715,10 +2821,10 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -2728,7 +2834,7 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -2775,9 +2881,12 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] [[package]] name = "fs2" @@ -2795,7 +2904,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.4", + "rustix 0.38.34", "windows-sys 0.48.0", ] @@ -2819,9 +2928,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -2834,9 +2943,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2844,15 +2953,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2862,9 +2971,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -2877,19 +2986,32 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite 0.2.14", +] + [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -2899,27 +3021,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls 0.20.8", - "webpki 0.22.0", + "rustls 0.20.9", + "webpki 0.22.4", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ "gloo-timers", "send_wrapper", @@ -2927,9 +3049,9 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2939,7 +3061,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", "pin-utils", "slab", ] @@ -2996,9 +3118,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3007,24 +3129,33 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "getrandom_or_panic" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "ghash" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", "polyval 0.5.3", ] [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ - "opaque-debug 0.3.0", - "polyval 0.6.1", + "opaque-debug 0.3.1", + "polyval 0.6.2", ] [[package]] @@ -3040,9 +3171,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -3052,15 +3183,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -3116,11 +3247,11 @@ checksum = "c390a940a5d157878dd057c78680a33ce3415bcd05b4799509ea44210914b4d5" dependencies = [ "cfg-if 1.0.0", "dashmap", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "no-std-compat", "nonzero_ext", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "quanta", "rand 0.8.5", "smallvec", @@ -3150,17 +3281,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.9.3", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -3169,9 +3300,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.3.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d" +checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" dependencies = [ "log", "pest", @@ -3202,7 +3333,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", ] [[package]] @@ -3211,30 +3342,29 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.11", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.11", "allocator-api2", ] [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.7", "bytes", "headers-core", - "http", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -3246,7 +3376,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.12", ] [[package]] @@ -3255,6 +3385,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -3266,9 +3402,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -3303,9 +3439,9 @@ dependencies = [ [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac 0.12.1", ] @@ -3350,6 +3486,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -3363,9 +3508,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -3374,13 +3530,13 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", - "pin-project-lite 0.2.10", + "http 0.2.12", + "pin-project-lite 0.2.14", ] [[package]] @@ -3397,9 +3553,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -3418,22 +3574,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", + "http 0.2.12", "http-body", "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.10", - "socket2 0.4.9", + "pin-project-lite 0.2.14", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -3446,14 +3602,30 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "http", + "http 0.2.12", + "hyper", + "log", + "rustls 0.20.9", + "rustls-native-certs", + "tokio", + "tokio-rustls 0.23.4", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", "hyper", "log", - "rustls 0.20.8", + "rustls 0.21.12", "rustls-native-certs", "tokio", - "tokio-rustls", - "webpki-roots", + "tokio-rustls 0.24.1", + "webpki-roots 0.25.4", ] [[package]] @@ -3471,16 +3643,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core 0.52.0", ] [[package]] @@ -3522,9 +3694,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3532,31 +3704,31 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.7.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" +checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a" dependencies = [ "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "if-watch" -version = "3.0.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" +checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" dependencies = [ - "async-io", + "async-io 2.3.2", "core-foundation", "fnv", - "futures 0.3.28", + "futures 0.3.30", "if-addrs", "ipnet", "log", "rtnetlink", "system-configuration", "tokio", - "windows 0.34.0", + "windows", ] [[package]] @@ -3607,12 +3779,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.1" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.5", ] [[package]] @@ -3667,7 +3839,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -3684,29 +3856,35 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.7", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.4", - "windows-sys 0.48.0", + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "issue" version = "1.0.7" @@ -3756,24 +3934,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3785,7 +3963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ "derive_more", - "futures 0.3.28", + "futures 0.3.30", "hyper", "hyper-tls", "jsonrpc-core", @@ -3803,7 +3981,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "futures-executor", "futures-util", "log", @@ -3818,7 +3996,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "jsonrpc-client-transports", ] @@ -3828,7 +4006,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "jsonrpc-core", "lazy_static", "log", @@ -3839,9 +4017,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" +checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -3856,16 +4034,16 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" +checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a" dependencies = [ "anyhow", "futures-channel", "futures-timer", "futures-util", "gloo-net", - "http", + "http 0.2.12", "jsonrpsee-core", "jsonrpsee-types", "pin-project", @@ -3873,21 +4051,21 @@ dependencies = [ "soketto", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tracing", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] name = "jsonrpsee-core" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" +checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" dependencies = [ "anyhow", "arrayvec 0.7.4", - "async-lock", + "async-lock 2.8.0", "async-trait", "beef", "futures-channel", @@ -3896,7 +4074,7 @@ dependencies = [ "globset", "hyper", "jsonrpsee-types", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "rustc-hash", "serde", @@ -3910,13 +4088,13 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" +checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ "async-trait", "hyper", - "hyper-rustls", + "hyper-rustls 0.24.2", "jsonrpsee-core", "jsonrpsee-types", "rustc-hash", @@ -3929,12 +4107,12 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" +checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ - "heck", - "proc-macro-crate", + "heck 0.4.1", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -3942,13 +4120,13 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" +checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" dependencies = [ "futures-channel", "futures-util", - "http", + "http 0.2.12", "hyper", "jsonrpsee-core", "jsonrpsee-types", @@ -3964,9 +4142,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" +checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" dependencies = [ "anyhow", "beef", @@ -3978,9 +4156,9 @@ dependencies = [ [[package]] name = "jsonrpsee-wasm-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77310456f43c6c89bcba1f6b2fc2a28300da7c341f320f5128f8c83cc63232d" +checksum = "18e5df77c8f625d36e4cfb583c5a674eccebe32403fcfe42f7ceff7fac9324dd" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -3989,11 +4167,11 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" +checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" dependencies = [ - "http", + "http 0.2.12", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -4001,22 +4179,22 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if 1.0.0", "ecdsa 0.16.9", - "elliptic-curve 0.13.7", + "elliptic-curve 0.13.8", "once_cell", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -4046,7 +4224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parking_lot 0.12.1", + "parking_lot 0.12.2", ] [[package]] @@ -4057,7 +4235,7 @@ checksum = "fe7a749456510c45f795e8b04a6a3e0976d0139213ecbf465843830ad55e2217" dependencies = [ "kvdb", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "regex", "rocksdb", "smallvec", @@ -4080,31 +4258,25 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if 1.0.0", - "winapi", + "windows-targets 0.52.5", ] [[package]] name = "libm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - -[[package]] -name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libp2p" @@ -4113,9 +4285,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8" dependencies = [ "bytes", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", - "getrandom 0.2.10", + "getrandom 0.2.15", "instant", "libp2p-core 0.38.0", "libp2p-dns", @@ -4135,7 +4307,7 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr 0.16.0", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project", "smallvec", ] @@ -4148,10 +4320,10 @@ checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" dependencies = [ "asn1_der", "bs58", - "ed25519-dalek", + "ed25519-dalek 1.0.1", "either", "fnv", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "instant", "log", @@ -4159,14 +4331,14 @@ dependencies = [ "multihash 0.16.3", "multistream-select", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project", "prost", "prost-build", "rand 0.8.5", "rw-stream-sink", "sec1 0.3.0", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "thiserror", "unsigned-varint", @@ -4182,7 +4354,7 @@ checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2" dependencies = [ "either", "fnv", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "instant", "libp2p-identity", @@ -4191,7 +4363,7 @@ dependencies = [ "multihash 0.17.0", "multistream-select", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project", "quick-protobuf", "rand 0.8.5", @@ -4208,10 +4380,10 @@ version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "libp2p-core 0.38.0", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "smallvec", "trust-dns-resolver", ] @@ -4223,7 +4395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" dependencies = [ "asynchronous-codec", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "libp2p-core 0.38.0", "libp2p-swarm", @@ -4239,18 +4411,18 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" +checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "log", "multiaddr 0.17.1", "multihash 0.17.0", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", "zeroize", ] @@ -4266,7 +4438,7 @@ dependencies = [ "bytes", "either", "fnv", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "instant", "libp2p-core 0.38.0", @@ -4275,7 +4447,7 @@ dependencies = [ "prost", "prost-build", "rand 0.8.5", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "thiserror", "uint", @@ -4290,14 +4462,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" dependencies = [ "data-encoding", - "futures 0.3.28", + "futures 0.3.30", "if-watch", "libp2p-core 0.38.0", "libp2p-swarm", "log", "rand 0.8.5", "smallvec", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "trust-dns-proto", "void", @@ -4325,11 +4497,11 @@ checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" dependencies = [ "asynchronous-codec", "bytes", - "futures 0.3.28", + "futures 0.3.30", "libp2p-core 0.38.0", "log", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "smallvec", "unsigned-varint", @@ -4343,14 +4515,14 @@ checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", - "futures 0.3.28", + "futures 0.3.30", "libp2p-core 0.38.0", "log", "once_cell", "prost", "prost-build", "rand 0.8.5", - "sha2 0.10.7", + "sha2 0.10.8", "snow", "static_assertions", "thiserror", @@ -4364,7 +4536,7 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "instant", "libp2p-core 0.38.0", @@ -4381,16 +4553,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" dependencies = [ "bytes", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "if-watch", "libp2p-core 0.38.0", "libp2p-tls", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "quinn-proto", "rand 0.8.5", - "rustls 0.20.8", + "rustls 0.20.9", "thiserror", "tokio", ] @@ -4403,7 +4575,7 @@ checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" dependencies = [ "async-trait", "bytes", - "futures 0.3.28", + "futures 0.3.30", "instant", "libp2p-core 0.38.0", "libp2p-swarm", @@ -4421,7 +4593,7 @@ checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" dependencies = [ "either", "fnv", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "instant", "libp2p-core 0.38.0", @@ -4441,7 +4613,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ - "heck", + "heck 0.4.1", "quote", "syn 1.0.109", ] @@ -4452,13 +4624,13 @@ version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "if-watch", "libc", "libp2p-core 0.38.0", "log", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", ] @@ -4468,15 +4640,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "futures-rustls", "libp2p-core 0.39.2", "libp2p-identity", "rcgen 0.10.0", - "ring", - "rustls 0.20.8", + "ring 0.16.20", + "rustls 0.20.9", "thiserror", - "webpki 0.22.0", + "webpki 0.22.4", "x509-parser 0.14.0", "yasna", ] @@ -4487,7 +4659,7 @@ version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "js-sys", "libp2p-core 0.38.0", "parity-send-wrapper", @@ -4504,7 +4676,7 @@ dependencies = [ "async-trait", "asynchronous-codec", "bytes", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "hex", "if-watch", @@ -4533,16 +4705,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" dependencies = [ "either", - "futures 0.3.28", + "futures 0.3.30", "futures-rustls", "libp2p-core 0.38.0", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "quicksink", "rw-stream-sink", "soketto", - "url 2.4.0", - "webpki-roots", + "url 2.5.0", + "webpki-roots 0.22.6", ] [[package]] @@ -4551,14 +4723,24 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "libp2p-core 0.38.0", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "thiserror", "yamux", ] +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + [[package]] name = "librocksdb-sys" version = "0.10.0+7.9.2" @@ -4624,9 +4806,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.10" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e6ab01971eb092ffe6a7d42f49f9ff42662f17604681e2843ad65077ba47dc" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "pkg-config", @@ -4659,9 +4841,9 @@ dependencies = [ [[package]] name = "linregress" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45" +checksum = "4de04dcecc58d366391f9920245b85ffa684558a5ef6e7736e754347c3aea9c2" dependencies = [ "nalgebra", ] @@ -4680,15 +4862,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -4696,9 +4878,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "value-bag", ] @@ -4750,6 +4932,15 @@ dependencies = [ "libc", ] +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + [[package]] name = "match_cfg" version = "0.1.0" @@ -4773,9 +4964,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ "autocfg", "rawpointer", @@ -4783,26 +4974,27 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if 1.0.0", "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memfd" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.37.23", + "rustix 0.38.34", ] [[package]] @@ -4823,15 +5015,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "memory-db" version = "0.32.0" @@ -4859,6 +5042,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "mime" version = "0.3.17" @@ -4883,18 +5078,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -5100,7 +5295,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.12", "httparse", "log", "memchr", @@ -5120,11 +5315,11 @@ dependencies = [ "data-encoding", "multibase", "multihash 0.16.3", - "percent-encoding 2.3.0", + "percent-encoding 2.3.1", "serde", "static_assertions", "unsigned-varint", - "url 2.4.0", + "url 2.5.0", ] [[package]] @@ -5139,11 +5334,11 @@ dependencies = [ "log", "multibase", "multihash 0.17.0", - "percent-encoding 2.3.0", + "percent-encoding 2.3.1", "serde", "static_assertions", "unsigned-varint", - "url 2.4.0", + "url 2.5.0", ] [[package]] @@ -5169,7 +5364,7 @@ dependencies = [ "core2", "digest 0.10.7", "multihash-derive", - "sha2 0.10.7", + "sha2 0.10.8", "sha3", "unsigned-varint", ] @@ -5191,7 +5386,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", @@ -5212,7 +5407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", - "futures 0.3.28", + "futures 0.3.30", "log", "pin-project", "smallvec", @@ -5221,9 +5416,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.3" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" +checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef" dependencies = [ "approx", "matrixmultiply", @@ -5318,7 +5513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" dependencies = [ "bytes", - "futures 0.3.28", + "futures 0.3.30", "log", "netlink-packet-core", "netlink-sys", @@ -5328,12 +5523,12 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", - "futures 0.3.28", + "futures 0.3.30", "libc", "log", "tokio", @@ -5348,7 +5543,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset", ] [[package]] @@ -5437,9 +5632,9 @@ dependencies = [ [[package]] name = "ntest" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da8ec6d2b73d45307e926f5af46809768581044384637af6b3f3fe7c3c88f512" +checksum = "41cd16a2e6992865367e7ca50cd6953d09daaed93641421168733a1274afadd6" dependencies = [ "ntest_test_cases", "ntest_timeout", @@ -5447,9 +5642,9 @@ dependencies = [ [[package]] name = "ntest_test_cases" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be7d33be719c6f4d09e64e27c1ef4e73485dc4cc1f4d22201f89860a7fe22e22" +checksum = "197eff6c12b80ff5de6173e438fa3c1340a9e708118c1626e690f65aee1e5332" dependencies = [ "proc-macro2", "quote", @@ -5458,11 +5653,11 @@ dependencies = [ [[package]] name = "ntest_timeout" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066b468120587a402f0b47d8f80035c921f6a46f8209efd0632a89a16f5188a4" +checksum = "ef492b5cf80f90c050b287e747228a1fa6517e9d754f364b5a7e0e038e49a25f" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -5470,24 +5665,29 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-format" version = "0.4.4" @@ -5500,11 +5700,10 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -5522,9 +5721,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -5535,7 +5734,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.9", "libc", ] @@ -5553,9 +5752,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -5580,9 +5779,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -5592,17 +5791,17 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -5619,7 +5818,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -5630,9 +5829,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -5756,9 +5955,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "output_vt100" @@ -5777,7 +5976,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -5788,17 +5987,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", -] - -[[package]] -name = "packed_simd_2" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" -dependencies = [ - "cfg-if 1.0.0", - "libm 0.1.4", + "sha2 0.10.8", ] [[package]] @@ -5968,9 +6157,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8" +checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e" dependencies = [ "blake2", "crc32fast", @@ -5980,17 +6169,18 @@ dependencies = [ "log", "lz4", "memmap2", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "siphasher", "snap", + "winapi", ] [[package]] name = "parity-scale-codec" -version = "3.6.4" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -6003,11 +6193,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.4" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 1.0.109", @@ -6027,9 +6217,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -6044,12 +6234,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.10", ] [[package]] @@ -6068,22 +6258,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -6135,25 +6325,26 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.1" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.1" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f94bca7e7a599d89dea5dfa309e217e7906c3c007fb9c3299c40b10d6a315d3" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -6161,56 +6352,56 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.1" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] name = "pest_meta" -version = "2.7.1" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674c66ebb4b4d9036012091b537aae5878970d6999f81a265034d85b136b341" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.2.6", ] [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -6221,9 +6412,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -6238,7 +6429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.0", + "fastrand 2.1.0", "futures-io", ] @@ -6258,15 +6449,15 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.8", + "der 0.7.9", "spki 0.7.3", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" @@ -6276,9 +6467,9 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "platforms" -version = "3.0.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "polling" @@ -6292,19 +6483,34 @@ dependencies = [ "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", "windows-sys 0.48.0", ] +[[package]] +name = "polling" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +dependencies = [ + "cfg-if 1.0.0", + "concurrent-queue", + "hermit-abi 0.3.9", + "pin-project-lite 0.2.14", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", - "opaque-debug 0.3.0", - "universal-hash 0.4.1", + "opaque-debug 0.3.1", + "universal-hash 0.5.1", ] [[package]] @@ -6315,19 +6521,19 @@ checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", "universal-hash 0.4.1", ] [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", "universal-hash 0.5.1", ] @@ -6354,6 +6560,12 @@ dependencies = [ "spacewalk-primitives", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -6427,9 +6639,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" +checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash 0.8.0", "impl-codec", @@ -6448,6 +6660,24 @@ dependencies = [ "toml 0.5.11", ] +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -6486,14 +6716,14 @@ checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -6531,15 +6761,15 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if 1.0.0", "fnv", "lazy_static", "memchr", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "thiserror", ] @@ -6551,7 +6781,7 @@ checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "prometheus-client-derive-text-encode", ] @@ -6583,7 +6813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools", "lazy_static", "log", @@ -6692,27 +6922,27 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", - "rustls 0.20.8", + "rustls 0.20.9", "slab", "thiserror", "tinyvec", "tracing", - "webpki 0.22.0", + "webpki 0.22.4", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -6810,7 +7040,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", ] [[package]] @@ -6873,8 +7103,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", - "ring", - "time 0.3.23", + "ring 0.16.20", + "time", "x509-parser 0.13.2", "yasna", ] @@ -6886,8 +7116,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.23", + "ring 0.16.20", + "time", "yasna", ] @@ -6945,42 +7175,51 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.15", + "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.19" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.19" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -6997,14 +7236,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", - "regex-syntax 0.7.4", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -7018,13 +7257,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.3", ] [[package]] @@ -7035,20 +7274,20 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "region" -version = "3.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" +checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7" dependencies = [ "bitflags 1.3.2", "libc", - "mach", - "winapi", + "mach2", + "windows-sys 0.52.0", ] [[package]] @@ -7097,17 +7336,17 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", "h2", - "http", + "http 0.2.12", "http-body", "hyper", "hyper-tls", @@ -7117,19 +7356,22 @@ dependencies = [ "mime", "native-tls", "once_cell", - "percent-encoding 2.3.0", - "pin-project-lite 0.2.10", + "percent-encoding 2.3.1", + "pin-project-lite 0.2.14", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", - "url 2.4.0", + "url 2.5.0", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.10.1", + "winreg", ] [[package]] @@ -7222,11 +7464,26 @@ checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if 1.0.0", + "getrandom 0.2.15", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", ] [[package]] @@ -7241,13 +7498,13 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.2.0" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", "rtoolbox", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -7267,7 +7524,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "log", "netlink-packet-route", "netlink-proto", @@ -7278,12 +7535,12 @@ dependencies = [ [[package]] name = "rtoolbox" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" dependencies = [ "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -7306,10 +7563,10 @@ version = "1.0.7" dependencies = [ "async-trait", "bytes", - "clap 4.3.19", + "clap 4.5.4", "env_logger 0.7.1", "exponential-backoff", - "futures 0.3.28", + "futures 0.3.30", "hex", "log", "mockall 0.8.3", @@ -7325,7 +7582,7 @@ dependencies = [ "tempdir", "thiserror", "tokio", - "url 2.4.0", + "url 2.5.0", ] [[package]] @@ -7338,7 +7595,7 @@ dependencies = [ "clap 3.2.25", "env_logger 0.8.4", "frame-support", - "futures 0.3.28", + "futures 0.3.30", "jsonrpsee", "log", "module-oracle-rpc-runtime-api", @@ -7364,15 +7621,15 @@ dependencies = [ "tempdir", "thiserror", "tokio", - "url 2.4.0", + "url 2.5.0", "wallet", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -7392,7 +7649,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.23", ] [[package]] @@ -7406,9 +7663,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.15" +version = "0.36.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" +checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed" dependencies = [ "bitflags 1.3.2", "errno", @@ -7420,9 +7677,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -7434,15 +7691,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", ] [[package]] @@ -7453,21 +7710,33 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.1", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +dependencies = [ + "log", + "ring 0.16.20", + "sct 0.7.1", + "webpki 0.22.4", +] + +[[package]] +name = "rustls" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring", - "sct 0.7.0", - "webpki 0.22.0", + "ring 0.17.8", + "rustls-webpki", + "sct 0.7.1", ] [[package]] @@ -7484,18 +7753,28 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "base64 0.21.2", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" [[package]] name = "rw-stream-sink" @@ -7503,16 +7782,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "pin-project", "static_assertions", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arch" @@ -7548,7 +7827,7 @@ name = "sc-basic-authorship" version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "log", "parity-scale-codec", @@ -7605,10 +7884,10 @@ name = "sc-chain-spec-derive" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -7618,9 +7897,9 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "array-bytes", "chrono", - "clap 4.3.19", + "clap 4.5.4", "fdlimit", - "futures 0.3.28", + "futures 0.3.30", "libp2p", "log", "names", @@ -7657,10 +7936,10 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "fnv", - "futures 0.3.28", + "futures 0.3.30", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -7690,7 +7969,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sc-client-api", "sc-state-db", "schnellru", @@ -7709,12 +7988,12 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "async-trait", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "libp2p", "log", "mockall 0.11.4", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sc-client-api", "sc-utils", "serde", @@ -7734,7 +8013,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "async-trait", - "futures 0.3.28", + "futures 0.3.30", "log", "parity-scale-codec", "sc-block-builder", @@ -7764,13 +8043,13 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "async-trait", "fork-tree", - "futures 0.3.28", + "futures 0.3.30", "log", "num-bigint", "num-rational", "num-traits", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sc-client-api", "sc-consensus", "sc-consensus-epochs", @@ -7811,17 +8090,17 @@ name = "sc-consensus-grandpa" version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.11", "array-bytes", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "sc-block-builder", "sc-chain-spec", @@ -7853,7 +8132,7 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "assert_matches", "async-trait", - "futures 0.3.28", + "futures 0.3.30", "jsonrpsee", "log", "parity-scale-codec", @@ -7886,7 +8165,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "async-trait", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "log", "parity-scale-codec", @@ -7910,7 +8189,7 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "lru", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -7963,7 +8242,7 @@ dependencies = [ "libc", "log", "once_cell", - "rustix 0.36.15", + "rustix 0.36.17", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -7977,7 +8256,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "ansi_term", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "log", "sc-client-api", @@ -7994,7 +8273,7 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "array-bytes", "async-trait", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "serde_json", "sp-application-crypto", "sp-core", @@ -8008,13 +8287,13 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "array-bytes", - "async-channel", + "async-channel 1.9.0", "async-trait", "asynchronous-codec", "bytes", "either", "fnv", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "ip_network", "libp2p", @@ -8023,7 +8302,7 @@ dependencies = [ "lru", "mockall 0.11.4", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project", "rand 0.8.5", "sc-block-builder", @@ -8053,7 +8332,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "cid", - "futures 0.3.28", + "futures 0.3.30", "libp2p", "log", "prost", @@ -8076,7 +8355,7 @@ dependencies = [ "async-trait", "bitflags 1.3.2", "bytes", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "libp2p", "parity-scale-codec", @@ -8100,8 +8379,8 @@ name = "sc-network-gossip" version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "ahash 0.8.3", - "futures 0.3.28", + "ahash 0.8.11", + "futures 0.3.30", "futures-timer", "libp2p", "log", @@ -8120,7 +8399,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "array-bytes", - "futures 0.3.28", + "futures 0.3.30", "libp2p", "log", "parity-scale-codec", @@ -8144,7 +8423,7 @@ dependencies = [ "array-bytes", "async-trait", "fork-tree", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "libp2p", "log", @@ -8176,7 +8455,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "array-bytes", - "futures 0.3.28", + "futures 0.3.30", "libp2p", "log", "parity-scale-codec", @@ -8198,15 +8477,15 @@ dependencies = [ "array-bytes", "bytes", "fnv", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "hyper", - "hyper-rustls", + "hyper-rustls 0.23.2", "libp2p", "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "sc-client-api", "sc-network", @@ -8226,7 +8505,7 @@ name = "sc-peerset" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "libp2p", "log", "sc-utils", @@ -8248,11 +8527,11 @@ name = "sc-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -8297,7 +8576,7 @@ name = "sc-rpc-server" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "http", + "http 0.2.12", "jsonrpsee", "log", "serde_json", @@ -8313,13 +8592,13 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "array-bytes", - "futures 0.3.28", + "futures 0.3.30", "futures-util", "hex", "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sc-chain-spec", "sc-client-api", "sc-transaction-pool-api", @@ -8341,12 +8620,12 @@ dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project", "rand 0.8.5", "sc-block-builder", @@ -8406,7 +8685,7 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sp-core", ] @@ -8415,9 +8694,9 @@ name = "sc-storage-monitor" version = "0.1.0" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "clap 4.3.19", + "clap 4.5.4", "fs4", - "futures 0.3.28", + "futures 0.3.30", "log", "sc-client-db", "sc-utils", @@ -8431,7 +8710,7 @@ name = "sc-sysinfo" version = "6.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "libc", "log", "rand 0.8.5", @@ -8451,10 +8730,10 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "chrono", - "futures 0.3.28", + "futures 0.3.30", "libp2p", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project", "rand 0.8.5", "sc-utils", @@ -8476,7 +8755,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "regex", "rustc-hash", "sc-client-api", @@ -8500,10 +8779,10 @@ name = "sc-tracing-proc-macro" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -8512,13 +8791,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "async-trait", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "linked-hash-map", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sc-client-api", "sc-transaction-pool-api", "sc-utils", @@ -8539,7 +8818,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "async-trait", - "futures 0.3.28", + "futures 0.3.30", "log", "serde", "sp-blockchain", @@ -8552,13 +8831,13 @@ name = "sc-utils" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "async-channel", - "futures 0.3.28", + "async-channel 1.9.0", + "futures 0.3.30", "futures-timer", "lazy_static", "log", - "parking_lot 0.12.1", - "prometheus 0.13.3", + "parking_lot 0.12.2", + "prometheus 0.13.4", "sp-arithmetic", ] @@ -8607,7 +8886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4391f0dfbb6690f035f6d2a15d6a12f88cc5395c36bcc056db07ffa2a90870ec" dependencies = [ "darling 0.14.4", - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -8635,7 +8914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "316e0fb10ec0fee266822bd641bab5e332a4ab80ef8c5b5ff35e5401a394f5a6" dependencies = [ "darling 0.14.4", - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -8643,9 +8922,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.9.0" +version = "2.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" +checksum = "7c453e59a955f81fb62ee5d596b450383d699f152d350e9d23a0db2adb78e4c0" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -8657,11 +8936,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.9.0" +version = "2.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" +checksum = "18cf6c6447f813ef19eb450e985bcce6705f9ce7660db221b59093d15c79c4b7" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -8706,11 +8985,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -8719,7 +8998,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.11", "cfg-if 1.0.0", "hashbrown 0.13.2", ] @@ -8734,7 +9013,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -8742,6 +9021,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "schnorrkel" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "curve25519-dalek 4.1.2", + "getrandom_or_panic", + "merlin 3.0.0", + "rand_core 0.6.4", + "sha2 0.10.8", + "subtle", + "zeroize", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -8766,18 +9062,18 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -8789,7 +9085,7 @@ dependencies = [ "rand 0.8.5", "substring", "thiserror", - "url 2.4.0", + "url 2.5.0", ] [[package]] @@ -8813,7 +9109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.8", + "der 0.7.9", "generic-array 0.14.7", "pkcs8 0.10.2", "subtle", @@ -8866,11 +9162,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -8879,9 +9175,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -8898,9 +9194,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -8919,29 +9215,29 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.175" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.175" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -8950,9 +9246,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -8982,7 +9278,7 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.23", + "time", ] [[package]] @@ -8991,10 +9287,10 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.3", + "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -9004,10 +9300,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153" dependencies = [ "dashmap", - "futures 0.3.28", + "futures 0.3.30", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "serial_test_derive", ] @@ -9029,7 +9325,7 @@ version = "1.0.7" dependencies = [ "async-trait", "clap 3.2.25", - "futures 0.3.28", + "futures 0.3.30", "governor", "hyper", "hyper-tls", @@ -9056,14 +9352,14 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -9092,14 +9388,14 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -9118,18 +9414,18 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" @@ -9143,9 +9439,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -9197,15 +9493,15 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -9218,38 +9514,38 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snap" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snow" -version = "0.9.2" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" dependencies = [ - "aes-gcm 0.9.4", + "aes-gcm 0.10.3", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-rc.1", + "curve25519-dalek 4.1.2", "rand_core 0.6.4", - "ring", + "ring 0.17.8", "rustc_version", - "sha2 0.10.7", + "sha2 0.10.8", "subtle", ] [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -9257,12 +9553,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -9283,8 +9579,8 @@ dependencies = [ "base64 0.13.1", "bytes", "flate2", - "futures 0.3.28", - "http", + "futures 0.3.30", + "http 0.2.12", "httparse", "log", "rand 0.8.5", @@ -9319,10 +9615,10 @@ dependencies = [ "Inflector", "blake2", "expander", - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -9369,11 +9665,11 @@ name = "sp-blockchain" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "log", "lru", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "sp-api", "sp-consensus", "sp-database", @@ -9388,7 +9684,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "async-trait", - "futures 0.3.28", + "futures 0.3.30", "log", "sp-core", "sp-inherents", @@ -9478,22 +9774,22 @@ dependencies = [ "bs58", "dyn-clonable", "ed25519-zebra", - "futures 0.3.28", + "futures 0.3.30", "hash-db", "hash256-std-hasher", "impl-serde", "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "paste", "primitive-types", "rand 0.8.5", "regex", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "secp256k1", "secrecy", "serde", @@ -9518,7 +9814,7 @@ dependencies = [ "blake2b_simd", "byteorder", "digest 0.10.7", - "sha2 0.10.7", + "sha2 0.10.8", "sha3", "sp-std 5.0.0", "twox-hash", @@ -9533,7 +9829,7 @@ dependencies = [ "blake2b_simd", "byteorder", "digest 0.10.7", - "sha2 0.10.7", + "sha2 0.10.8", "sha3", "sp-std 8.0.0", "twox-hash", @@ -9547,7 +9843,7 @@ dependencies = [ "proc-macro2", "quote", "sp-core-hashing 5.0.0", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -9556,7 +9852,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "kvdb", - "parking_lot 0.12.1", + "parking_lot 0.12.2", ] [[package]] @@ -9566,7 +9862,7 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -9601,9 +9897,9 @@ version = "7.0.0" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "bytes", - "ed25519", - "ed25519-dalek", - "futures 0.3.28", + "ed25519 1.5.3", + "ed25519-dalek 1.0.1", + "futures 0.3.30", "libsecp256k1", "log", "parity-scale-codec", @@ -9637,9 +9933,9 @@ name = "sp-keystore" version = "0.13.0" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "serde", "sp-core", "sp-externalities", @@ -9742,10 +10038,10 @@ version = "6.0.0" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -9783,7 +10079,7 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "smallvec", "sp-core", @@ -9876,14 +10172,14 @@ name = "sp-trie" version = "7.0.0" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.11", "hash-db", "hashbrown 0.13.2", "lazy_static", "memory-db", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "scale-info", "schnellru", "sp-core", @@ -9919,7 +10215,7 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -9984,7 +10280,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "getrandom 0.2.10", + "getrandom 0.2.15", "hex", "hex-literal 0.3.4", "issue", @@ -10053,7 +10349,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "getrandom 0.2.10", + "getrandom 0.2.15", "hex", "hex-literal 0.3.4", "issue", @@ -10110,12 +10406,12 @@ dependencies = [ name = "spacewalk-standalone" version = "1.0.7" dependencies = [ - "clap 4.3.19", + "clap 4.5.4", "frame-benchmarking", "frame-benchmarking-cli", "frame-support", "frame-system", - "futures 0.3.28", + "futures 0.3.30", "hex-literal 0.2.2", "jsonrpc-core", "jsonrpsee", @@ -10202,14 +10498,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.8", + "der 0.7.9", ] [[package]] name = "ss58-registry" -version = "1.41.0" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc443bad666016e012538782d9e3006213a7db43e9fb1dda91657dc06a6fa08" +checksum = "4743ce898933fbff7bbf414f497c459a782d496269644b3d650a398ae6a487ba" dependencies = [ "Inflector", "num-format", @@ -10299,7 +10595,7 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "sp-core", "sp-io", "sp-runtime", @@ -10323,7 +10619,7 @@ dependencies = [ "serde_json", "serde_with", "serial_test", - "sha2 0.10.7", + "sha2 0.10.8", "substrate-stellar-sdk", "tokio", "tweetnacl", @@ -10336,6 +10632,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.24.1" @@ -10351,7 +10653,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -10369,23 +10671,23 @@ dependencies = [ "lazy_static", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "subtle", "thiserror", "tokio", - "url 2.4.0", + "url 2.5.0", "webrtc-util", ] [[package]] name = "substrate-bip39" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" +checksum = "6a7590dc041b9bc2825e52ce5af8416c73dbe9d0654402bfd4b4941938b94d8f" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel", + "schnorrkel 0.11.4", "sha2 0.9.9", "zeroize", ] @@ -10404,7 +10706,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.28", + "futures 0.3.30", "jsonrpsee", "log", "parity-scale-codec", @@ -10424,7 +10726,7 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "hyper", "log", - "prometheus 0.13.3", + "prometheus 0.13.4", "thiserror", "tokio", ] @@ -10432,7 +10734,7 @@ dependencies = [ [[package]] name = "substrate-stellar-sdk" version = "0.2.4" -source = "git+https://github.com/pendulum-chain/substrate-stellar-sdk?branch=polkadot-v0.9.42#d61280df65e8694beb53653649c1948a9ffcb541" +source = "git+https://github.com/pendulum-chain/substrate-stellar-sdk?branch=polkadot-v0.9.42#cda1a1cf2c8e99a8c3c2e739b80e5caea4cd99a7" dependencies = [ "base64 0.13.1", "hex", @@ -10489,12 +10791,12 @@ dependencies = [ "bitvec", "derivative", "frame-metadata", - "futures 0.3.28", - "getrandom 0.2.10", + "futures 0.3.30", + "getrandom 0.2.15", "hex", "jsonrpsee", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "scale-decode 0.4.0", "scale-info", "scale-value 0.6.0", @@ -10519,8 +10821,8 @@ dependencies = [ "derivative", "either", "frame-metadata", - "futures 0.3.28", - "getrandom 0.2.10", + "futures 0.3.30", + "getrandom 0.2.15", "hex", "impl-serde", "jsonrpsee", @@ -10545,7 +10847,7 @@ name = "subxt-client" version = "1.0.7" dependencies = [ "futures 0.1.31", - "futures 0.3.28", + "futures 0.3.30", "jsonrpsee", "jsonrpsee-core", "jsonrpsee-types", @@ -10568,7 +10870,7 @@ checksum = "7722c31febf55eb300c73d977da5d65cfd6fb443419b1185b9abcdd9925fd7be" dependencies = [ "darling 0.14.4", "frame-metadata", - "heck", + "heck 0.4.1", "hex", "jsonrpsee", "parity-scale-codec", @@ -10588,7 +10890,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e2f231d97c145c564bd544212c0cc0c29c09ff516af199f4ce00c8e055f8138" dependencies = [ "frame-metadata", - "heck", + "heck 0.4.1", "hex", "jsonrpsee", "parity-scale-codec", @@ -10596,7 +10898,7 @@ dependencies = [ "quote", "scale-info", "subxt-metadata 0.29.0", - "syn 2.0.27", + "syn 2.0.61", "thiserror", "tokio", ] @@ -10619,10 +10921,10 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e544e41e1c84b616632cd2f86862342868f62e11e4cd9062a9e3dbf5fc871f64" dependencies = [ - "darling 0.20.3", + "darling 0.20.8", "proc-macro-error", "subxt-codegen 0.29.0", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -10663,15 +10965,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -10743,9 +11051,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempdir" @@ -10759,22 +11067,21 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.0", - "redox_syscall 0.3.5", - "rustix 0.38.4", - "windows-sys 0.48.0", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -10787,28 +11094,28 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -10819,9 +11126,9 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -10838,9 +11145,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.3+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" dependencies = [ "cc", "libc", @@ -10848,21 +11155,14 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.23" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -10870,16 +11170,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -10895,7 +11196,7 @@ dependencies = [ "pbkdf2 0.11.0", "rand 0.8.5", "rustc-hash", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", "unicode-normalization", "wasm-bindgen", @@ -10929,33 +11230,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite 0.2.10", + "parking_lot 0.12.2", + "pin-project-lite 0.2.14", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -10965,7 +11265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcb585a0069b53171684e22d5255984ec30d1c7304fd0a4a9a603ffd8c765cdd" dependencies = [ "futures-util", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", ] [[package]] @@ -10984,28 +11284,38 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.8", + "rustls 0.20.9", + "tokio", + "webpki 0.22.4", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", "tokio", - "webpki 0.22.0", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", "tokio", "tokio-util", ] [[package]] name = "tokio-tungstenite" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", @@ -11015,17 +11325,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", "tokio", - "tracing", ] [[package]] @@ -11046,7 +11355,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -11064,13 +11373,35 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.1", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -11092,10 +11423,10 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", + "http 0.2.12", "http-body", "http-range-header", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", "tower-layer", "tower-service", ] @@ -11114,33 +11445,32 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.10", + "pin-project-lite 0.2.14", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -11158,12 +11488,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -11240,12 +11570,12 @@ dependencies = [ "lazy_static", "rand 0.8.5", "smallvec", - "socket2 0.4.9", + "socket2 0.4.10", "thiserror", "tinyvec", "tokio", "tracing", - "url 2.4.0", + "url 2.5.0", ] [[package]] @@ -11259,7 +11589,7 @@ dependencies = [ "ipconfig", "lazy_static", "lru-cache", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "resolv-conf", "smallvec", "thiserror", @@ -11270,9 +11600,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tt-call" @@ -11282,20 +11612,20 @@ checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" [[package]] name = "tungstenite" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", - "http", + "data-encoding", + "http 1.1.0", "httparse", "log", "rand 0.8.5", "sha1", "thiserror", - "url 2.4.0", + "url 2.5.0", "utf-8", ] @@ -11307,11 +11637,11 @@ checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" dependencies = [ "async-trait", "base64 0.13.1", - "futures 0.3.28", + "futures 0.3.30", "log", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "stun", "thiserror", "tokio", @@ -11351,9 +11681,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -11375,39 +11705,39 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -11437,9 +11767,9 @@ dependencies = [ [[package]] name = "unsigned-varint" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" dependencies = [ "asynchronous-codec", "bytes", @@ -11453,6 +11783,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "1.7.2" @@ -11466,13 +11802,13 @@ dependencies = [ [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", - "percent-encoding 2.3.0", + "idna 0.5.0", + "percent-encoding 2.3.1", ] [[package]] @@ -11489,11 +11825,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", ] [[package]] @@ -11504,9 +11840,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cdbaf5e132e593e9fc1de6a15bbec912395b11fb9719e061cf64f804524c503" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "vault" @@ -11522,7 +11858,7 @@ dependencies = [ "err-derive", "flate2", "frame-support", - "futures 0.3.28", + "futures 0.3.30", "governor", "hex", "itertools", @@ -11533,7 +11869,7 @@ dependencies = [ "nonzero_ext", "ntest", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "reqwest", "runtime", @@ -11642,15 +11978,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -11663,7 +11999,7 @@ dependencies = [ "async-trait", "cached", "dotenv", - "futures 0.3.28", + "futures 0.3.30", "mockall 0.8.3", "mocktopus", "parity-scale-codec", @@ -11693,29 +12029,27 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba431ef570df1287f7f8b07e376491ad54f84d26ac473489427231e1718e1f69" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ "bytes", "futures-channel", "futures-util", "headers", - "http", + "http 0.2.12", "hyper", "log", "mime", "mime_guess", "multer", - "percent-encoding 2.3.0", + "percent-encoding 2.3.1", "pin-project", - "rustls-pemfile", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-stream", "tokio-tungstenite", "tokio-util", "tower-service", @@ -11742,9 +12076,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -11752,24 +12086,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -11779,9 +12113,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11789,22 +12123,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-instrument" @@ -11862,7 +12196,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -11898,7 +12232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", - "libm 0.2.7", + "libm", "memory_units", "num-rational", "num-traits", @@ -11912,7 +12246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" dependencies = [ "indexmap 1.9.3", - "url 2.4.0", + "url 2.5.0", ] [[package]] @@ -11964,9 +12298,9 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.36.15", + "rustix 0.36.17", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "toml 0.5.11", "windows-sys 0.42.0", "zstd 0.11.2+zstd.1.5.2", @@ -12044,7 +12378,7 @@ checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" dependencies = [ "object 0.29.0", "once_cell", - "rustix 0.36.15", + "rustix 0.36.17", ] [[package]] @@ -12072,10 +12406,10 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.6.5", + "memoffset", "paste", "rand 0.8.5", - "rustix 0.36.15", + "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", @@ -12096,9 +12430,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -12110,18 +12444,18 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -12130,9 +12464,15 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.0", + "webpki 0.22.4", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + [[package]] name = "webrtc" version = "0.6.0" @@ -12149,20 +12489,20 @@ dependencies = [ "rand 0.8.5", "rcgen 0.9.3", "regex", - "ring", + "ring 0.16.20", "rtcp", "rtp", "rustls 0.19.1", "sdp", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "stun", "thiserror", - "time 0.3.23", + "time", "tokio", "turn", - "url 2.4.0", + "url 2.5.0", "waitgroup", "webrtc-data", "webrtc-dtls", @@ -12191,12 +12531,12 @@ dependencies = [ [[package]] name = "webrtc-dtls" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05" +checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267" dependencies = [ "aes 0.6.0", - "aes-gcm 0.10.2", + "aes-gcm 0.10.3", "async-trait", "bincode", "block-modes", @@ -12208,25 +12548,24 @@ dependencies = [ "hkdf", "hmac 0.12.1", "log", - "oid-registry 0.6.1", "p256", "p384", "rand 0.8.5", "rand_core 0.6.4", - "rcgen 0.9.3", - "ring", + "rcgen 0.10.0", + "ring 0.16.20", "rustls 0.19.1", "sec1 0.3.0", "serde", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "signature 1.6.4", "subtle", "thiserror", "tokio", "webpki 0.21.4", "webrtc-util", - "x25519-dalek 2.0.0-pre.1", + "x25519-dalek 2.0.1", "x509-parser 0.13.2", ] @@ -12247,7 +12586,7 @@ dependencies = [ "thiserror", "tokio", "turn", - "url 2.4.0", + "url 2.5.0", "uuid", "waitgroup", "webrtc-mdns", @@ -12261,7 +12600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" dependencies = [ "log", - "socket2 0.4.9", + "socket2 0.4.10", "thiserror", "tokio", "webrtc-util", @@ -12344,20 +12683,21 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.34", ] [[package]] name = "wide" -version = "0.7.11" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" +checksum = "0f0e39d2c603fdc0504b12b458cf1f34e0b937ed2f4f2dc20796e3e86f34e11f" dependencies = [ "bytemuck", "safe_arch", @@ -12365,9 +12705,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -12387,11 +12727,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -12402,24 +12742,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.34.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", + "windows-core 0.51.1", + "windows-targets 0.48.5", ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.52.5", ] [[package]] @@ -12452,7 +12798,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -12472,17 +12827,33 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -12493,15 +12864,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" +name = "windows_aarch64_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -12511,15 +12882,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] -name = "windows_i686_gnu" -version = "0.34.0" +name = "windows_aarch64_msvc" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -12529,15 +12900,21 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] -name = "windows_i686_msvc" -version = "0.34.0" +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -12547,15 +12924,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" +name = "windows_i686_msvc" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -12565,9 +12942,15 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -12577,15 +12960,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" +name = "windows_x86_64_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -12595,26 +12978,23 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "winnow" -version = "0.5.28" +name = "windows_x86_64_msvc" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" -dependencies = [ - "memchr", -] +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] -name = "winreg" -version = "0.10.1" +name = "winnow" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ - "winapi", + "memchr", ] [[package]] @@ -12649,12 +13029,13 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.1.2", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -12671,10 +13052,10 @@ dependencies = [ "lazy_static", "nom", "oid-registry 0.4.0", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", - "time 0.3.23", + "time", ] [[package]] @@ -12692,7 +13073,7 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.23", + "time", ] [[package]] @@ -12719,7 +13100,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -12728,10 +13109,10 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "log", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "rand 0.8.5", "static_assertions", ] @@ -12754,14 +13135,34 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.23", + "time", +] + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -12774,7 +13175,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.61", ] [[package]] @@ -12817,11 +13218,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 530d6bcb6..b96a1753f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -155,3 +155,7 @@ xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9. [patch.crates-io] sp-core = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } + +# We need to patch this to https://github.com/tkaitchuck/aHash/releases/tag/v0.8.11 to prevent a build error +# 'error[E0635]: unknown feature `stdsimd`' that occurs because this feature was removed in the latest nightly versions +ahash = { git = "https://github.com/tkaitchuck/aHash", rev = "db36e4c4f0606b786bc617eefaffbe4ae9100762" } \ No newline at end of file From e92bb7c2e4f9feeae99900a9b31e9d6b9c3568f9 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Tue, 7 May 2024 18:04:39 +0200 Subject: [PATCH 05/26] Formatting --- .../src/testing_utils/mock_convertors.rs | 15 ++++++---- pallets/oracle/src/tests.rs | 10 ++++--- pallets/reward-distribution/src/tests.rs | 28 +++++++++---------- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/pallets/oracle/src/testing_utils/mock_convertors.rs b/pallets/oracle/src/testing_utils/mock_convertors.rs index 5646dc1ed..ec24bb3cf 100644 --- a/pallets/oracle/src/testing_utils/mock_convertors.rs +++ b/pallets/oracle/src/testing_utils/mock_convertors.rs @@ -13,12 +13,15 @@ impl Convert, Vec)>> for MockOracleKeyConvertor { CurrencyId::XCM(token_symbol) => Some((vec![0u8], vec![token_symbol])), CurrencyId::Native => Some((vec![2u8], vec![0])), CurrencyId::StellarNative => Some((vec![3u8], vec![0])), - CurrencyId::Stellar(Asset::AlphaNum4 { code, .. }) => - Some((vec![4u8], code.to_vec())), - CurrencyId::Stellar(Asset::AlphaNum12 { code, .. }) => - Some((vec![5u8], code.to_vec())), - CurrencyId::ZenlinkLPToken(token1_id, token1_type, token2_id, token2_type) => - Some((vec![6u8], vec![token1_id, token1_type, token2_id, token2_type])), + CurrencyId::Stellar(Asset::AlphaNum4 { code, .. }) => { + Some((vec![4u8], code.to_vec())) + }, + CurrencyId::Stellar(Asset::AlphaNum12 { code, .. }) => { + Some((vec![5u8], code.to_vec())) + }, + CurrencyId::ZenlinkLPToken(token1_id, token1_type, token2_id, token2_type) => { + Some((vec![6u8], vec![token1_id, token1_type, token2_id, token2_type])) + }, CurrencyId::Token(token_symbol) => { let token_symbol = token_symbol.to_be_bytes().to_vec(); Some((vec![7], token_symbol)) diff --git a/pallets/oracle/src/tests.rs b/pallets/oracle/src/tests.rs index 7a12a8a5d..d32437c02 100644 --- a/pallets/oracle/src/tests.rs +++ b/pallets/oracle/src/tests.rs @@ -170,11 +170,13 @@ fn test_amount_conversion() { OracleKey::ExchangeRate(currency) => { match currency { // XCM(0) is worth 5 USD - CurrencyId::XCM(0) => - MockResult::Return(Ok(FixedU128::from_rational(5, 1))), + CurrencyId::XCM(0) => { + MockResult::Return(Ok(FixedU128::from_rational(5, 1))) + }, // XCM(1) is worth 1 USD - CurrencyId::XCM(1) => - MockResult::Return(Ok(FixedU128::from_rational(1, 1))), + CurrencyId::XCM(1) => { + MockResult::Return(Ok(FixedU128::from_rational(1, 1))) + }, _ => { panic!("Unexpected currency") }, diff --git a/pallets/reward-distribution/src/tests.rs b/pallets/reward-distribution/src/tests.rs index 648e03211..0898b974c 100644 --- a/pallets/reward-distribution/src/tests.rs +++ b/pallets/reward-distribution/src/tests.rs @@ -33,20 +33,20 @@ fn to_usd( fn expected_vault_rewards( reward: ::Balance, ) -> Vec<::Balance> { - let total_collateral_in_usd = to_usd(&COLLATERAL_POOL_1, &DEFAULT_COLLATERAL_CURRENCY) + - to_usd(&COLLATERAL_POOL_2, &XCM(1)) + - to_usd(&COLLATERAL_POOL_3, &XCM(2)) + - to_usd(&COLLATERAL_POOL_4, &XCM(3)); - - let reward_pool_1 = (reward as f64 * - (to_usd(&COLLATERAL_POOL_1, &DEFAULT_COLLATERAL_CURRENCY) as f64) / - (total_collateral_in_usd as f64)) as u128; - let reward_pool_2 = (reward as f64 * (to_usd(&COLLATERAL_POOL_2, &XCM(1)) as f64) / - (total_collateral_in_usd as f64)) as u128; - let reward_pool_3 = (reward as f64 * (to_usd(&COLLATERAL_POOL_3, &XCM(2)) as f64) / - (total_collateral_in_usd as f64)) as u128; - let reward_pool_4 = (reward as f64 * (to_usd(&COLLATERAL_POOL_4, &XCM(3)) as f64) / - (total_collateral_in_usd as f64)) as u128; + let total_collateral_in_usd = to_usd(&COLLATERAL_POOL_1, &DEFAULT_COLLATERAL_CURRENCY) + + to_usd(&COLLATERAL_POOL_2, &XCM(1)) + + to_usd(&COLLATERAL_POOL_3, &XCM(2)) + + to_usd(&COLLATERAL_POOL_4, &XCM(3)); + + let reward_pool_1 = (reward as f64 + * (to_usd(&COLLATERAL_POOL_1, &DEFAULT_COLLATERAL_CURRENCY) as f64) + / (total_collateral_in_usd as f64)) as u128; + let reward_pool_2 = (reward as f64 * (to_usd(&COLLATERAL_POOL_2, &XCM(1)) as f64) + / (total_collateral_in_usd as f64)) as u128; + let reward_pool_3 = (reward as f64 * (to_usd(&COLLATERAL_POOL_3, &XCM(2)) as f64) + / (total_collateral_in_usd as f64)) as u128; + let reward_pool_4 = (reward as f64 * (to_usd(&COLLATERAL_POOL_4, &XCM(3)) as f64) + / (total_collateral_in_usd as f64)) as u128; vec![reward_pool_1, reward_pool_2, reward_pool_3, reward_pool_4] } From 60d63e9d0e94157f15f735bc155e7bf876cd98ee Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Tue, 7 May 2024 18:08:06 +0200 Subject: [PATCH 06/26] Refactor error messages --- clients/runner/src/main.rs | 2 +- clients/runner/src/runner.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clients/runner/src/main.rs b/clients/runner/src/main.rs index 163a84ea1..6b2764826 100644 --- a/clients/runner/src/main.rs +++ b/clients/runner/src/main.rs @@ -41,7 +41,7 @@ async fn main() -> Result<(), Error> { let opts: Opts = Opts::parse(); let rpc_client = retry_with_log_async( || subxt_api(&opts.parachain_ws).into_future().boxed(), - "Error fetching executable".to_string(), + "Error running RPC client".to_string(), ) .await?; log::info!("Connected to the parachain"); diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index 10cd91d0d..6bc5fffdf 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -162,7 +162,7 @@ impl Runner { .into_future() .boxed() }, - "Error fetching executable".to_string(), + "Error downloading executable".to_string(), ) .await?; @@ -187,7 +187,7 @@ impl Runner { let bytes = retry_with_log_async( || Runner::get_request_bytes(release.uri.clone()).into_future().boxed(), - "Error fetching executable".to_string(), + "Error getting request bytes for executable".to_string(), ) .await?; @@ -290,7 +290,7 @@ impl Runner { .into_future() .boxed() }, - "Error fetching executable".to_string(), + "Error reading chain storage for release".to_string(), ) .await } From a6fe253ca61520f48fe26534a59466ae69cb845a Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 8 May 2024 11:07:54 +0200 Subject: [PATCH 07/26] Restore original logic with max retry interval --- clients/runner/src/runner.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index 6bc5fffdf..65d11f9a1 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -19,7 +19,7 @@ use std::{ path::PathBuf, process::{Child, Command, Stdio}, str::{self, FromStr}, - time::Duration, + time::{Duration, Instant}, }; use subxt::{dynamic::Value, OnlineClient, PolkadotConfig}; @@ -63,10 +63,10 @@ pub const CURRENT_RELEASES_STORAGE_ITEM: &str = "CurrentClientReleases"; /// Parachain block time pub const BLOCK_TIME: Duration = Duration::from_secs(12); -/// Timeout used by the retry utilities: One minute +/// The duration up until operations are retried, used by the retry utilities: 60 seconds pub const RETRY_TIMEOUT: Duration = Duration::from_millis(60_000); -/// Waiting interval used by the retry utilities: One second +/// Waiting interval used by the retry utilities: 1 second pub const RETRY_INTERVAL: Duration = Duration::from_millis(1_000); /// Multiplier for the interval in retry utilities: Constant interval retry @@ -589,9 +589,11 @@ pub async fn subxt_api(url: &str) -> Result, Error> } fn create_backoff_strategy() -> exponential_backoff::Backoff { - let mut backoff = exponential_backoff::Backoff::new(u32::MAX, RETRY_INTERVAL, RETRY_TIMEOUT); + let retries: u32 = (RETRY_TIMEOUT.as_secs() / RETRY_INTERVAL.as_secs()) as u32; + + // We set `min` and `max` to the same value to have a constant interval retry + let mut backoff = exponential_backoff::Backoff::new(retries, RETRY_INTERVAL, RETRY_INTERVAL); backoff.set_factor(RETRY_MULTIPLIER); - backoff.set_jitter(0.3); backoff } From bc4c6fcffb1b207abb763961c6e505921992b21d Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 8 May 2024 11:10:06 +0200 Subject: [PATCH 08/26] Remove import --- clients/runner/src/runner.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index 65d11f9a1..c2ba79997 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -19,7 +19,7 @@ use std::{ path::PathBuf, process::{Child, Command, Stdio}, str::{self, FromStr}, - time::{Duration, Instant}, + time::Duration, }; use subxt::{dynamic::Value, OnlineClient, PolkadotConfig}; From 32b8d0a1337a7751e67c97c147ce9b8c2b1d71ed Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 8 May 2024 14:38:23 +0200 Subject: [PATCH 09/26] Run `cargo +nightly-2024-02-09 fmt --all` From 93c9bb2857e4d2c6d2397f780a61bd8f909866c6 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 8 May 2024 17:38:25 +0200 Subject: [PATCH 10/26] Run cargo fmt with nightly --- clients/runtime/src/error.rs | 10 +++---- pallets/oracle/src/dia.rs | 8 +++--- pallets/oracle/src/lib.rs | 6 ++-- pallets/oracle/src/oracle_mock.rs | 15 ++++------ .../src/testing_utils/mock_convertors.rs | 15 ++++------ pallets/oracle/src/tests.rs | 10 +++---- pallets/redeem/src/lib.rs | 5 ++-- pallets/reward-distribution/src/lib.rs | 4 +-- pallets/reward-distribution/src/tests.rs | 28 +++++++++---------- pallets/security/src/lib.rs | 4 +-- 10 files changed, 47 insertions(+), 58 deletions(-) diff --git a/clients/runtime/src/error.rs b/clients/runtime/src/error.rs index 15ea44f5a..0befd9dd3 100644 --- a/clients/runtime/src/error.rs +++ b/clients/runtime/src/error.rs @@ -160,7 +160,7 @@ impl Error { pub fn is_rpc_disconnect_error(&self) -> bool { match self { - Error::SubxtRuntimeError(SubxtError::Rpc(RpcError::ClientError(e))) => { + Error::SubxtRuntimeError(SubxtError::Rpc(RpcError::ClientError(e))) => match e.downcast_ref::() { Some(e) => matches!(e, JsonRpseeError::RestartNeeded(_)), None => { @@ -169,8 +169,7 @@ impl Error { ); false }, - } - }, + }, Error::SubxtRuntimeError(SubxtError::Rpc(RpcError::SubscriptionDropped)) => true, _ => false, } @@ -204,7 +203,7 @@ impl Error { pub fn is_timeout_error(&self) -> bool { match self { - Error::SubxtRuntimeError(SubxtError::Rpc(RpcError::ClientError(e))) => { + Error::SubxtRuntimeError(SubxtError::Rpc(RpcError::ClientError(e))) => match e.downcast_ref::() { Some(e) => matches!(e, JsonRpseeError::RequestTimeout), None => { @@ -213,8 +212,7 @@ impl Error { ); false }, - } - }, + }, _ => false, } } diff --git a/pallets/oracle/src/dia.rs b/pallets/oracle/src/dia.rs index d97a86d6f..4e92c2c55 100644 --- a/pallets/oracle/src/dia.rs +++ b/pallets/oracle/src/dia.rs @@ -74,8 +74,8 @@ impl Convert None, + CurrencyId::Stellar(primitives::Asset::AlphaNum12 { .. }) | + CurrencyId::ZenlinkLPToken(_, _, _, _) => None, CurrencyId::Token(_) => None, }, } @@ -93,8 +93,8 @@ impl Convert<(Vec, Vec), O Some(OracleKey::ExchangeRate(CurrencyId::XCM(xcm_currency_id))) } else if blockchain == T::native_chain() && symbol == T::native_symbol() { Some(OracleKey::ExchangeRate(CurrencyId::Native)) - } else if blockchain == STELLAR_DIA_BLOCKCHAIN.as_bytes().to_vec() - && symbol == STELLAR_DIA_SYMBOL.as_bytes().to_vec() + } else if blockchain == STELLAR_DIA_BLOCKCHAIN.as_bytes().to_vec() && + symbol == STELLAR_DIA_SYMBOL.as_bytes().to_vec() { Some(OracleKey::ExchangeRate(CurrencyId::StellarNative)) } else if blockchain == FIAT_DIA_BLOCKCHAIN.as_bytes().to_vec() { diff --git a/pallets/oracle/src/lib.rs b/pallets/oracle/src/lib.rs index 50955e0cd..c766ac301 100644 --- a/pallets/oracle/src/lib.rs +++ b/pallets/oracle/src/lib.rs @@ -234,9 +234,9 @@ impl Pallet { } let current_status_is_online = Self::is_oracle_online(); - let new_status_is_online = oracle_keys.len() > 0 - && updated_items_len > 0 - && updated_items_len == oracle_keys.len(); + let new_status_is_online = oracle_keys.len() > 0 && + updated_items_len > 0 && + updated_items_len == oracle_keys.len(); if current_status_is_online != new_status_is_online { if new_status_is_online { diff --git a/pallets/oracle/src/oracle_mock.rs b/pallets/oracle/src/oracle_mock.rs index 22698c0d5..bec944a97 100644 --- a/pallets/oracle/src/oracle_mock.rs +++ b/pallets/oracle/src/oracle_mock.rs @@ -41,15 +41,12 @@ impl Convert, Vec)>> for MockOracleKeyConvertor { CurrencyId::XCM(token_symbol) => Some((vec![0u8], vec![token_symbol])), CurrencyId::Native => Some((vec![2u8], vec![])), CurrencyId::StellarNative => Some((vec![3u8], vec![])), - CurrencyId::Stellar(Asset::AlphaNum4 { code, .. }) => { - Some((vec![4u8], code.to_vec())) - }, - CurrencyId::Stellar(Asset::AlphaNum12 { code, .. }) => { - Some((vec![5u8], code.to_vec())) - }, - CurrencyId::ZenlinkLPToken(token1_id, token1_type, token2_id, token2_type) => { - Some((vec![6], vec![token1_id, token1_type, token2_id, token2_type])) - }, + CurrencyId::Stellar(Asset::AlphaNum4 { code, .. }) => + Some((vec![4u8], code.to_vec())), + CurrencyId::Stellar(Asset::AlphaNum12 { code, .. }) => + Some((vec![5u8], code.to_vec())), + CurrencyId::ZenlinkLPToken(token1_id, token1_type, token2_id, token2_type) => + Some((vec![6], vec![token1_id, token1_type, token2_id, token2_type])), CurrencyId::Token(token_symbol) => { let token_symbol = token_symbol.to_be_bytes().to_vec(); Some((vec![7], token_symbol)) diff --git a/pallets/oracle/src/testing_utils/mock_convertors.rs b/pallets/oracle/src/testing_utils/mock_convertors.rs index ec24bb3cf..5646dc1ed 100644 --- a/pallets/oracle/src/testing_utils/mock_convertors.rs +++ b/pallets/oracle/src/testing_utils/mock_convertors.rs @@ -13,15 +13,12 @@ impl Convert, Vec)>> for MockOracleKeyConvertor { CurrencyId::XCM(token_symbol) => Some((vec![0u8], vec![token_symbol])), CurrencyId::Native => Some((vec![2u8], vec![0])), CurrencyId::StellarNative => Some((vec![3u8], vec![0])), - CurrencyId::Stellar(Asset::AlphaNum4 { code, .. }) => { - Some((vec![4u8], code.to_vec())) - }, - CurrencyId::Stellar(Asset::AlphaNum12 { code, .. }) => { - Some((vec![5u8], code.to_vec())) - }, - CurrencyId::ZenlinkLPToken(token1_id, token1_type, token2_id, token2_type) => { - Some((vec![6u8], vec![token1_id, token1_type, token2_id, token2_type])) - }, + CurrencyId::Stellar(Asset::AlphaNum4 { code, .. }) => + Some((vec![4u8], code.to_vec())), + CurrencyId::Stellar(Asset::AlphaNum12 { code, .. }) => + Some((vec![5u8], code.to_vec())), + CurrencyId::ZenlinkLPToken(token1_id, token1_type, token2_id, token2_type) => + Some((vec![6u8], vec![token1_id, token1_type, token2_id, token2_type])), CurrencyId::Token(token_symbol) => { let token_symbol = token_symbol.to_be_bytes().to_vec(); Some((vec![7], token_symbol)) diff --git a/pallets/oracle/src/tests.rs b/pallets/oracle/src/tests.rs index d32437c02..7a12a8a5d 100644 --- a/pallets/oracle/src/tests.rs +++ b/pallets/oracle/src/tests.rs @@ -170,13 +170,11 @@ fn test_amount_conversion() { OracleKey::ExchangeRate(currency) => { match currency { // XCM(0) is worth 5 USD - CurrencyId::XCM(0) => { - MockResult::Return(Ok(FixedU128::from_rational(5, 1))) - }, + CurrencyId::XCM(0) => + MockResult::Return(Ok(FixedU128::from_rational(5, 1))), // XCM(1) is worth 1 USD - CurrencyId::XCM(1) => { - MockResult::Return(Ok(FixedU128::from_rational(1, 1))) - }, + CurrencyId::XCM(1) => + MockResult::Return(Ok(FixedU128::from_rational(1, 1))), _ => { panic!("Unexpected currency") }, diff --git a/pallets/redeem/src/lib.rs b/pallets/redeem/src/lib.rs index 8ceb4c3c4..b2d2071f8 100644 --- a/pallets/redeem/src/lib.rs +++ b/pallets/redeem/src/lib.rs @@ -1068,9 +1068,8 @@ impl Pallet { match request.status { RedeemRequestStatus::Pending => Ok(request), RedeemRequestStatus::Completed => Err(Error::::RedeemCompleted.into()), - RedeemRequestStatus::Reimbursed(_) | RedeemRequestStatus::Retried => { - Err(Error::::RedeemCancelled.into()) - }, + RedeemRequestStatus::Reimbursed(_) | RedeemRequestStatus::Retried => + Err(Error::::RedeemCancelled.into()), } } diff --git a/pallets/reward-distribution/src/lib.rs b/pallets/reward-distribution/src/lib.rs index 7bd0686f6..df91cdad2 100644 --- a/pallets/reward-distribution/src/lib.rs +++ b/pallets/reward-distribution/src/lib.rs @@ -299,8 +299,8 @@ impl Pallet { let mut reward_this_block = reward_per_block; - if Ok(true) - == ext::security::parachain_block_expired::( + if Ok(true) == + ext::security::parachain_block_expired::( rewards_adapted_at, T::DecayInterval::get().saturating_sub(T::BlockNumber::one()), ) { diff --git a/pallets/reward-distribution/src/tests.rs b/pallets/reward-distribution/src/tests.rs index 0898b974c..648e03211 100644 --- a/pallets/reward-distribution/src/tests.rs +++ b/pallets/reward-distribution/src/tests.rs @@ -33,20 +33,20 @@ fn to_usd( fn expected_vault_rewards( reward: ::Balance, ) -> Vec<::Balance> { - let total_collateral_in_usd = to_usd(&COLLATERAL_POOL_1, &DEFAULT_COLLATERAL_CURRENCY) - + to_usd(&COLLATERAL_POOL_2, &XCM(1)) - + to_usd(&COLLATERAL_POOL_3, &XCM(2)) - + to_usd(&COLLATERAL_POOL_4, &XCM(3)); - - let reward_pool_1 = (reward as f64 - * (to_usd(&COLLATERAL_POOL_1, &DEFAULT_COLLATERAL_CURRENCY) as f64) - / (total_collateral_in_usd as f64)) as u128; - let reward_pool_2 = (reward as f64 * (to_usd(&COLLATERAL_POOL_2, &XCM(1)) as f64) - / (total_collateral_in_usd as f64)) as u128; - let reward_pool_3 = (reward as f64 * (to_usd(&COLLATERAL_POOL_3, &XCM(2)) as f64) - / (total_collateral_in_usd as f64)) as u128; - let reward_pool_4 = (reward as f64 * (to_usd(&COLLATERAL_POOL_4, &XCM(3)) as f64) - / (total_collateral_in_usd as f64)) as u128; + let total_collateral_in_usd = to_usd(&COLLATERAL_POOL_1, &DEFAULT_COLLATERAL_CURRENCY) + + to_usd(&COLLATERAL_POOL_2, &XCM(1)) + + to_usd(&COLLATERAL_POOL_3, &XCM(2)) + + to_usd(&COLLATERAL_POOL_4, &XCM(3)); + + let reward_pool_1 = (reward as f64 * + (to_usd(&COLLATERAL_POOL_1, &DEFAULT_COLLATERAL_CURRENCY) as f64) / + (total_collateral_in_usd as f64)) as u128; + let reward_pool_2 = (reward as f64 * (to_usd(&COLLATERAL_POOL_2, &XCM(1)) as f64) / + (total_collateral_in_usd as f64)) as u128; + let reward_pool_3 = (reward as f64 * (to_usd(&COLLATERAL_POOL_3, &XCM(2)) as f64) / + (total_collateral_in_usd as f64)) as u128; + let reward_pool_4 = (reward as f64 * (to_usd(&COLLATERAL_POOL_4, &XCM(3)) as f64) / + (total_collateral_in_usd as f64)) as u128; vec![reward_pool_1, reward_pool_2, reward_pool_3, reward_pool_4] } diff --git a/pallets/security/src/lib.rs b/pallets/security/src/lib.rs index 398e6140c..792f7df96 100644 --- a/pallets/security/src/lib.rs +++ b/pallets/security/src/lib.rs @@ -214,8 +214,8 @@ impl Pallet { /// Checks if the Parachain has a OracleOffline Error state pub fn is_parachain_error_oracle_offline() -> bool { - Self::parachain_status() == StatusCode::Error - && >::get().contains(&ErrorCode::OracleOffline) + Self::parachain_status() == StatusCode::Error && + >::get().contains(&ErrorCode::OracleOffline) } /// Sets the given `StatusCode`. From 8784c23201a8010c910d86cde795238bfa2d2aa1 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Mon, 13 May 2024 10:24:18 +0200 Subject: [PATCH 11/26] Add logic to reopen the runner websocket --- clients/runner/src/main.rs | 8 +--- clients/runner/src/runner.rs | 77 +++++++++++++++++++++++++----------- 2 files changed, 56 insertions(+), 29 deletions(-) diff --git a/clients/runner/src/main.rs b/clients/runner/src/main.rs index 6b2764826..c58213c0f 100644 --- a/clients/runner/src/main.rs +++ b/clients/runner/src/main.rs @@ -11,7 +11,7 @@ use signal_hook::consts::*; use signal_hook_tokio::Signals; use std::{fmt::Debug, path::PathBuf}; -use crate::runner::{retry_with_log_async, subxt_api, Runner}; +use crate::runner::{retry_with_log_async, subxt_api, try_create_subxt_api, Runner}; #[derive(Parser, Debug, Clone)] #[clap(version, author, about, trailing_var_arg = true)] @@ -39,11 +39,7 @@ async fn main() -> Result<(), Error> { .filter_or(env_logger::DEFAULT_FILTER_ENV, log::LevelFilter::Info.as_str()), ); let opts: Opts = Opts::parse(); - let rpc_client = retry_with_log_async( - || subxt_api(&opts.parachain_ws).into_future().boxed(), - "Error running RPC client".to_string(), - ) - .await?; + let rpc_client = try_create_subxt_api(&opts.parachain_ws)?; log::info!("Connected to the parachain"); let runner = Runner::new(rpc_client, opts); diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index c2ba79997..9ad80d28e 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -1,7 +1,7 @@ use crate::{error::Error, Opts}; use bytes::Bytes; use codec::Decode; -use futures::{future::BoxFuture, FutureExt, StreamExt, TryFutureExt}; +use futures::{future::BoxFuture, FutureExt, SinkExt, StreamExt, TryFutureExt}; use nix::{ sys::signal::{self, Signal}, unistd::Pid, @@ -363,27 +363,38 @@ impl Runner { loop { runner.maybe_restart_client()?; - if let Some(new_release) = runner.try_get_release().await? { - let maybe_downloaded_release = runner.downloaded_release(); - let downloaded_release = - maybe_downloaded_release.as_ref().ok_or(Error::NoDownloadedRelease)?; - if new_release.checksum != downloaded_release.checksum { - log::info!("Found new client release, updating..."); - - // Wait for child process to finish completely. - // To ensure there can't be two client processes using the same resources (such - // as the Stellar wallet for vaults). - runner.terminate_proc_and_wait()?; - - // Delete old release - runner.delete_downloaded_release()?; - - // Download new release - runner.download_binary(new_release).await?; - - // Run the downloaded release - runner.run_binary()?; - } + match runner.try_get_release().await? { + None => { + // Create new RPC client, assuming it's a websocket connection error. + // We can't detect if it's a websocket error (https://github.com/paritytech/subxt/issues/1190) + // so we just close and reopen the connection. + // replace with https://github.com/pendulum-chain/spacewalk/issues/521 eventually + log::info!("Could not get release, reopening connection..."); + runner.reopen_subxt_api()?; + log::info!("Connection reopened") + }, + Some(new_release) => { + let maybe_downloaded_release = runner.downloaded_release(); + let downloaded_release = + maybe_downloaded_release.as_ref().ok_or(Error::NoDownloadedRelease)?; + if new_release.checksum != downloaded_release.checksum { + log::info!("Found new client release, updating..."); + + // Wait for child process to finish completely. + // To ensure there can't be two client processes using the same resources + // (such as the Stellar wallet for vaults). + runner.terminate_proc_and_wait()?; + + // Delete old release + runner.delete_downloaded_release()?; + + // Download new release + runner.download_binary(new_release).await?; + + // Run the downloaded release + runner.run_binary()?; + } + }, } tokio::time::sleep(BLOCK_TIME).await; } @@ -445,6 +456,8 @@ impl Drop for Runner { #[async_trait] pub trait RunnerExt { fn subxt_api(&self) -> &OnlineClient; + /// Close the current RPC client and create a new one to the same endpoint. + fn reopen_subxt_api(&mut self) -> Result<(), Error>; fn client_args(&self) -> &Vec; fn child_proc(&mut self) -> &mut Option; fn set_child_proc(&mut self, child_proc: Option); @@ -488,6 +501,15 @@ impl RunnerExt for Runner { &self.subxt_api } + fn reopen_subxt_api(&mut self) -> Result<(), Error> { + // Ignore the error if the client is already closed + let _ = self.subxt_api.close(); + // Create new RPC client + let new_api = try_create_subxt_api(&self.opts.parachain_ws)?; + self.subxt_api = new_api; + Ok(()) + } + fn client_args(&self) -> &Vec { &self.opts.client_args } @@ -584,7 +606,15 @@ impl StorageReader for Runner { } } -pub async fn subxt_api(url: &str) -> Result, Error> { +pub async fn try_create_subxt_api(url: &str) -> Result, Error> { + retry_with_log_async( + || subxt_api(url).into_future().boxed(), + "Error creating RPC client".to_string(), + ) + .await +} + +async fn subxt_api(url: &str) -> Result, Error> { Ok(OnlineClient::from_url(url).await?) } @@ -687,6 +717,7 @@ mod tests { #[async_trait] pub trait RunnerExt { fn subxt_api(&self) -> &OnlineClient; + fn reopen_subxt_api(&mut self) -> Result<(), Error>; fn client_args(&self) -> &Vec; fn child_proc(&mut self) -> &mut Option; fn set_child_proc(&mut self, child_proc: Option); From e24496d3c4ca6a64fec3a16e3eb2f0f07fa61fb7 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Mon, 13 May 2024 10:27:22 +0200 Subject: [PATCH 12/26] Add debug logs --- clients/runner/src/runner.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index 9ad80d28e..1b73fdd7f 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -618,9 +618,13 @@ async fn subxt_api(url: &str) -> Result, Error> { Ok(OnlineClient::from_url(url).await?) } +// Creates a backoff strategy for retrying operations. The backoff strategy is a constant 1-second +// interval. The number of retries is calculated based on the `RETRY_TIMEOUT` and `RETRY_INTERVAL`. fn create_backoff_strategy() -> exponential_backoff::Backoff { let retries: u32 = (RETRY_TIMEOUT.as_secs() / RETRY_INTERVAL.as_secs()) as u32; + log::info!("Creating backoff strategy with {retries} retries"); + // We set `min` and `max` to the same value to have a constant interval retry let mut backoff = exponential_backoff::Backoff::new(retries, RETRY_INTERVAL, RETRY_INTERVAL); backoff.set_factor(RETRY_MULTIPLIER); @@ -632,6 +636,8 @@ where F: FnMut() -> Result, { let backoff = create_backoff_strategy(); + // For debugging purposes + let mut counter = 0; // We store the error to return it if the backoff is exhausted let mut error = None; @@ -640,6 +646,10 @@ where Ok(result) => return Ok(result), Err(err) => { log::info!("{}: {}. Retrying...", log_msg, err.to_string()); + + log::debug!("Retry attempt: {}", counter); + counter += 1; + std::thread::sleep(duration); error = Some(err) }, @@ -655,6 +665,8 @@ where E: Into + Sized + Display, { let backoff = create_backoff_strategy(); + // For debugging purposes + let mut counter = 0; // We store the error to return it if the backoff is exhausted let mut error = None; @@ -663,6 +675,10 @@ where Ok(result) => return Ok(result), Err(err) => { log::info!("{}: {}. Retrying...", log_msg, err.to_string()); + + log::debug!("Retry attempt: {}", counter); + counter += 1; + tokio::time::sleep(duration).await; error = Some(err) }, From d553ed7c6f9546c072b7eb72888adf2883a503bf Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Mon, 13 May 2024 11:19:00 +0200 Subject: [PATCH 13/26] Fix compile issues --- clients/runner/src/main.rs | 5 ++--- clients/runner/src/runner.rs | 15 +++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/clients/runner/src/main.rs b/clients/runner/src/main.rs index c58213c0f..8f17db552 100644 --- a/clients/runner/src/main.rs +++ b/clients/runner/src/main.rs @@ -5,13 +5,12 @@ use clap::Parser; use error::Error; -use futures::{FutureExt, TryFutureExt}; use runner::ClientType; use signal_hook::consts::*; use signal_hook_tokio::Signals; use std::{fmt::Debug, path::PathBuf}; -use crate::runner::{retry_with_log_async, subxt_api, try_create_subxt_api, Runner}; +use crate::runner::{try_create_subxt_api, Runner}; #[derive(Parser, Debug, Clone)] #[clap(version, author, about, trailing_var_arg = true)] @@ -39,7 +38,7 @@ async fn main() -> Result<(), Error> { .filter_or(env_logger::DEFAULT_FILTER_ENV, log::LevelFilter::Info.as_str()), ); let opts: Opts = Opts::parse(); - let rpc_client = try_create_subxt_api(&opts.parachain_ws)?; + let rpc_client = try_create_subxt_api(&opts.parachain_ws).await?; log::info!("Connected to the parachain"); let runner = Runner::new(rpc_client, opts); diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index 1b73fdd7f..e44d6a5c2 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -1,7 +1,7 @@ use crate::{error::Error, Opts}; use bytes::Bytes; use codec::Decode; -use futures::{future::BoxFuture, FutureExt, SinkExt, StreamExt, TryFutureExt}; +use futures::{future::BoxFuture, FutureExt, StreamExt, TryFutureExt}; use nix::{ sys::signal::{self, Signal}, unistd::Pid, @@ -370,7 +370,7 @@ impl Runner { // so we just close and reopen the connection. // replace with https://github.com/pendulum-chain/spacewalk/issues/521 eventually log::info!("Could not get release, reopening connection..."); - runner.reopen_subxt_api()?; + runner.reopen_subxt_api().await?; log::info!("Connection reopened") }, Some(new_release) => { @@ -457,7 +457,7 @@ impl Drop for Runner { pub trait RunnerExt { fn subxt_api(&self) -> &OnlineClient; /// Close the current RPC client and create a new one to the same endpoint. - fn reopen_subxt_api(&mut self) -> Result<(), Error>; + async fn reopen_subxt_api(&mut self) -> Result<(), Error>; fn client_args(&self) -> &Vec; fn child_proc(&mut self) -> &mut Option; fn set_child_proc(&mut self, child_proc: Option); @@ -501,11 +501,10 @@ impl RunnerExt for Runner { &self.subxt_api } - fn reopen_subxt_api(&mut self) -> Result<(), Error> { - // Ignore the error if the client is already closed - let _ = self.subxt_api.close(); + async fn reopen_subxt_api(&mut self) -> Result<(), Error> { // Create new RPC client - let new_api = try_create_subxt_api(&self.opts.parachain_ws)?; + let new_api = try_create_subxt_api(&self.opts.parachain_ws).await?; + // We don't need to explicitly close the old one as it should close when dropped self.subxt_api = new_api; Ok(()) } @@ -733,7 +732,7 @@ mod tests { #[async_trait] pub trait RunnerExt { fn subxt_api(&self) -> &OnlineClient; - fn reopen_subxt_api(&mut self) -> Result<(), Error>; + async fn reopen_subxt_api(&mut self) -> Result<(), Error>; fn client_args(&self) -> &Vec; fn child_proc(&mut self) -> &mut Option; fn set_child_proc(&mut self, child_proc: Option); From 585c267709185fac32fbca21bc24ffd0af05d9db Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 15 May 2024 09:41:09 +0200 Subject: [PATCH 14/26] Add test for the backoff/retry logic --- clients/runner/src/runner.rs | 54 ++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index e44d6a5c2..d05c8d9e3 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -762,6 +762,32 @@ mod tests { } } + // Test the backoff/retry implementation + #[tokio::test] + async fn test_retry_with_log_async() { + let counter = std::sync::Mutex::new(0); + let expected_retries = (RETRY_TIMEOUT.as_secs() / RETRY_INTERVAL.as_secs()) as u32; + + let result: Result<(), Error> = retry_with_log_async( + || { + let mut counter = counter.lock().unwrap(); + *counter += 1; + if (*counter as u32) > expected_retries { + panic!("Backoff retries more often than expected") + } + + // We always return an error. It can be any error + Box::pin(async { Err(Error::ProcessTerminationFailure) }) + }, + "Error. Retrying".to_string(), + ) + .await; + // We expect to get the returned error as a result once all retries are exhausted + assert!(result.is_err()); + let counter = *counter.lock().unwrap(); + assert_eq!(counter, expected_retries); + } + //Before running this test, ensure uri and checksum of the test file match! #[tokio::test] async fn test_runner_download_binary() { @@ -1091,6 +1117,34 @@ mod tests { ); } + #[tokio::test] + async fn test_runner_reconnects_failing_rpc() { + let tmp = TempDir::new("runner-tests").expect("failed to create tempdir"); + let mock_path = tmp.path().to_path_buf().join("client"); + let mut runner = MockRunner::default(); + + // Create a closure that returns Ok(()) for the first call and an error for the second call + // let mut try_get_release = runner.expect_try_get_release(); + // try_get_release.returning(|| Ok(None)); + // try_get_release.returning(|| Err(Error::ProcessTerminationFailure)); + runner.expect_download_path().return_const(mock_path.clone()); + runner + .expect_try_load_downloaded_binary() + .returning(|_| Err(Error::IncorrectChecksum)); + runner + .expect_try_get_release() + .once() + .returning(|| Ok(Some(ClientRelease::default()))); + + let result = Runner::auto_update(&mut runner).await; + // log result + match result { + Ok(_) => log::error!("Auto-updater unexpectedly terminated."), + Err(e) => log::error!("Runner error: {}", e), + } + // assert_err!(result, Error::ProcessTerminationFailure); + } + #[tokio::test] async fn test_runner_invalid_binary_prompts_download() { let tmp = TempDir::new("runner-tests").expect("failed to create tempdir"); From 2bf4dc22554802b673165cdb75b268276d12d3e5 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 15 May 2024 09:57:38 +0200 Subject: [PATCH 15/26] Simplify retry logic --- Cargo.lock | 10 --------- clients/runner/Cargo.toml | 1 - clients/runner/src/runner.rs | 40 +++++++++++++++--------------------- 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb0debe30..0e9548cec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2417,15 +2417,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "exponential-backoff" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47f78d87d930eee4b5686a2ab032de499c72bd1e954b84262bb03492a0f932cd" -dependencies = [ - "rand 0.8.5", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -7565,7 +7556,6 @@ dependencies = [ "bytes", "clap 4.5.4", "env_logger 0.7.1", - "exponential-backoff", "futures 0.3.30", "hex", "log", diff --git a/clients/runner/Cargo.toml b/clients/runner/Cargo.toml index add1ff0bb..1898b5bcf 100644 --- a/clients/runner/Cargo.toml +++ b/clients/runner/Cargo.toml @@ -22,7 +22,6 @@ bytes = "1.1.0" signal-hook = "0.3.14" signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"] } futures = "0.3.21" -exponential-backoff = "1.2.0" subxt = { version = "0.29.0", default-features = false, features = ["jsonrpsee-ws"] } sha2 = "0.8.2" diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index d05c8d9e3..66e6d1fdd 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -66,12 +66,9 @@ pub const BLOCK_TIME: Duration = Duration::from_secs(12); /// The duration up until operations are retried, used by the retry utilities: 60 seconds pub const RETRY_TIMEOUT: Duration = Duration::from_millis(60_000); -/// Waiting interval used by the retry utilities: 1 second +/// Waiting (sleep) interval used by the retry utilities: 1 second pub const RETRY_INTERVAL: Duration = Duration::from_millis(1_000); -/// Multiplier for the interval in retry utilities: Constant interval retry -pub const RETRY_MULTIPLIER: u32 = 1; - /// Data type assumed to be used by the parachain to store the client release. /// If this type is different from the on-chain one, decoding will fail. #[derive(Decode, Default, Eq, PartialEq, Debug, Clone)] @@ -617,30 +614,21 @@ async fn subxt_api(url: &str) -> Result, Error> { Ok(OnlineClient::from_url(url).await?) } -// Creates a backoff strategy for retrying operations. The backoff strategy is a constant 1-second -// interval. The number of retries is calculated based on the `RETRY_TIMEOUT` and `RETRY_INTERVAL`. -fn create_backoff_strategy() -> exponential_backoff::Backoff { - let retries: u32 = (RETRY_TIMEOUT.as_secs() / RETRY_INTERVAL.as_secs()) as u32; - - log::info!("Creating backoff strategy with {retries} retries"); - - // We set `min` and `max` to the same value to have a constant interval retry - let mut backoff = exponential_backoff::Backoff::new(retries, RETRY_INTERVAL, RETRY_INTERVAL); - backoff.set_factor(RETRY_MULTIPLIER); - backoff -} - pub fn retry_with_log(mut f: F, log_msg: String) -> Result where F: FnMut() -> Result, { - let backoff = create_backoff_strategy(); // For debugging purposes let mut counter = 0; // We store the error to return it if the backoff is exhausted let mut error = None; - while let Some(duration) = backoff.iter().next() { + + // We retry for the number of retries calculated based on the `RETRY_TIMEOUT` and + // `RETRY_INTERVAL` + let retries = + (RETRY_TIMEOUT.as_secs().checked_div(RETRY_INTERVAL.as_secs()).unwrap_or(1)) as u32; + for _ in 0..retries { match f() { Ok(result) => return Ok(result), Err(err) => { @@ -649,7 +637,7 @@ where log::debug!("Retry attempt: {}", counter); counter += 1; - std::thread::sleep(duration); + std::thread::sleep(RETRY_INTERVAL); error = Some(err) }, } @@ -663,13 +651,17 @@ where F: Fn() -> BoxFuture<'a, Result>, E: Into + Sized + Display, { - let backoff = create_backoff_strategy(); // For debugging purposes let mut counter = 0; // We store the error to return it if the backoff is exhausted let mut error = None; - while let Some(duration) = backoff.iter().next() { + + // We retry for the number of retries calculated based on the `RETRY_TIMEOUT` and + // `RETRY_INTERVAL` + let retries = + (RETRY_TIMEOUT.as_secs().checked_div(RETRY_INTERVAL.as_secs()).unwrap_or(1)) as u32; + for _ in 0..retries { match f().await { Ok(result) => return Ok(result), Err(err) => { @@ -678,7 +670,7 @@ where log::debug!("Retry attempt: {}", counter); counter += 1; - tokio::time::sleep(duration).await; + tokio::time::sleep(RETRY_INTERVAL).await; error = Some(err) }, } @@ -776,7 +768,7 @@ mod tests { panic!("Backoff retries more often than expected") } - // We always return an error. It can be any error + // We always return an error so that we retry. It can be any error Box::pin(async { Err(Error::ProcessTerminationFailure) }) }, "Error. Retrying".to_string(), From 8c2f5cb49d71953484870f68424ddaeb91aad5c2 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 15 May 2024 10:02:09 +0200 Subject: [PATCH 16/26] Use test for both --- clients/runner/src/runner.rs | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index 66e6d1fdd..861e8c686 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -626,8 +626,7 @@ where // We retry for the number of retries calculated based on the `RETRY_TIMEOUT` and // `RETRY_INTERVAL` - let retries = - (RETRY_TIMEOUT.as_secs().checked_div(RETRY_INTERVAL.as_secs()).unwrap_or(1)) as u32; + let retries = RETRY_TIMEOUT.as_secs().checked_div(RETRY_INTERVAL.as_secs()).unwrap_or(1); for _ in 0..retries { match f() { Ok(result) => return Ok(result), @@ -659,8 +658,7 @@ where // We retry for the number of retries calculated based on the `RETRY_TIMEOUT` and // `RETRY_INTERVAL` - let retries = - (RETRY_TIMEOUT.as_secs().checked_div(RETRY_INTERVAL.as_secs()).unwrap_or(1)) as u32; + let retries = RETRY_TIMEOUT.as_secs().checked_div(RETRY_INTERVAL.as_secs()).unwrap_or(1); for _ in 0..retries { match f().await { Ok(result) => return Ok(result), @@ -756,15 +754,35 @@ mod tests { // Test the backoff/retry implementation #[tokio::test] - async fn test_retry_with_log_async() { + async fn test_retry_with_log() { + let expected_retries = + RETRY_TIMEOUT.as_secs().checked_div(RETRY_INTERVAL.as_secs()).unwrap_or(0); + let counter = std::sync::Mutex::new(0); - let expected_retries = (RETRY_TIMEOUT.as_secs() / RETRY_INTERVAL.as_secs()) as u32; + let result: Result<(), Error> = retry_with_log( + || { + let mut counter = counter.lock().unwrap(); + *counter += 1; + if (*counter) > expected_retries { + panic!("Backoff retries more often than expected") + } + + // We always return an error so that we retry. It can be any error + Err(Error::ProcessTerminationFailure) + }, + "Error. Retrying".to_string(), + ); + // We expect to get the returned error as a result once all retries are exhausted + assert!(result.is_err()); + let counter = *counter.lock().unwrap(); + assert_eq!(counter, expected_retries); + let counter = std::sync::Mutex::new(0); let result: Result<(), Error> = retry_with_log_async( || { let mut counter = counter.lock().unwrap(); *counter += 1; - if (*counter as u32) > expected_retries { + if (*counter) > expected_retries { panic!("Backoff retries more often than expected") } From 11504edd5448e721e4d5260b8a70bacfad728bf3 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 15 May 2024 10:12:42 +0200 Subject: [PATCH 17/26] Remove unfinished test case and refactor --- clients/runner/src/runner.rs | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index 861e8c686..6a4943712 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -366,9 +366,11 @@ impl Runner { // We can't detect if it's a websocket error (https://github.com/paritytech/subxt/issues/1190) // so we just close and reopen the connection. // replace with https://github.com/pendulum-chain/spacewalk/issues/521 eventually - log::info!("Could not get release, reopening connection..."); - runner.reopen_subxt_api().await?; - log::info!("Connection reopened") + log::info!("Could not get release, reopening connection to RPC endpoint..."); + match runner.reopen_subxt_api().await { + Ok(_) => log::info!("Connection to RPC endpoint reopened"), + Err(e) => log::error!("Failed to reopen connection: {}", e), + } }, Some(new_release) => { let maybe_downloaded_release = runner.downloaded_release(); @@ -1127,34 +1129,6 @@ mod tests { ); } - #[tokio::test] - async fn test_runner_reconnects_failing_rpc() { - let tmp = TempDir::new("runner-tests").expect("failed to create tempdir"); - let mock_path = tmp.path().to_path_buf().join("client"); - let mut runner = MockRunner::default(); - - // Create a closure that returns Ok(()) for the first call and an error for the second call - // let mut try_get_release = runner.expect_try_get_release(); - // try_get_release.returning(|| Ok(None)); - // try_get_release.returning(|| Err(Error::ProcessTerminationFailure)); - runner.expect_download_path().return_const(mock_path.clone()); - runner - .expect_try_load_downloaded_binary() - .returning(|_| Err(Error::IncorrectChecksum)); - runner - .expect_try_get_release() - .once() - .returning(|| Ok(Some(ClientRelease::default()))); - - let result = Runner::auto_update(&mut runner).await; - // log result - match result { - Ok(_) => log::error!("Auto-updater unexpectedly terminated."), - Err(e) => log::error!("Runner error: {}", e), - } - // assert_err!(result, Error::ProcessTerminationFailure); - } - #[tokio::test] async fn test_runner_invalid_binary_prompts_download() { let tmp = TempDir::new("runner-tests").expect("failed to create tempdir"); From 110dceb3f7e8cb1d63bbff9022cdc97c6b32cbc4 Mon Sep 17 00:00:00 2001 From: b-yap <2826165+b-yap@users.noreply.github.com> Date: Thu, 16 May 2024 16:33:56 +0800 Subject: [PATCH 18/26] fix trailing semicolons --- clients/runtime/src/error.rs | 4 ++-- clients/wallet/src/cache.rs | 14 +++++++------- pallets/currency/src/amount.rs | 4 ++-- pallets/oracle/src/dia.rs | 2 +- pallets/oracle/src/lib.rs | 4 ++-- pallets/pooled-rewards/src/lib.rs | 6 +++--- pallets/reward-distribution/src/lib.rs | 16 ++++++++-------- testchain/runtime/mainnet/src/lib.rs | 4 ++-- testchain/runtime/testnet/src/lib.rs | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/clients/runtime/src/error.rs b/clients/runtime/src/error.rs index 0befd9dd3..dd96d6c47 100644 --- a/clients/runtime/src/error.rs +++ b/clients/runtime/src/error.rs @@ -137,10 +137,10 @@ impl Error { let data_string = custom_error.data().map(ToString::to_string).unwrap_or_default(); if RecoverableError::is_recoverable(&data_string) { - return Some(Recoverability::Recoverable(data_string)); + return Some(Recoverability::Recoverable(data_string)) } - return Some(Recoverability::Unrecoverable(data_string)); + return Some(Recoverability::Unrecoverable(data_string)) } else { None } diff --git a/clients/wallet/src/cache.rs b/clients/wallet/src/cache.rs index 60da3c89f..002b7f1a8 100644 --- a/clients/wallet/src/cache.rs +++ b/clients/wallet/src/cache.rs @@ -20,7 +20,7 @@ macro_rules! unwrap_or_return { Ok(result) => result, Err(e) => { tracing::warn!("{:?}: {:?}", $log, e); - return $ret; + return $ret }, } }; @@ -66,7 +66,7 @@ impl WalletStateStorage { let path = self.cursor_path(); let path = Path::new(&path); if !path.exists() { - return 0; + return 0 } let Ok(content_from_file) = read_content_from_path(path) else { return 0 }; @@ -131,7 +131,7 @@ impl WalletStateStorage { return Err(Error::cache_error_with_seq( CacheErrorKind::SequenceNumberAlreadyUsed, sequence, - )); + )) } let mut file = OpenOptions::new() @@ -189,7 +189,7 @@ impl WalletStateStorage { if let Err(e) = create_dir_all(&full_path) { tracing::warn!("Failed to create directory of {full_path}: {:?}", e); } - return; + return }; for entry in directory.flatten() { @@ -207,7 +207,7 @@ impl WalletStateStorage { let path = Path::new(&full_file_path); if !path.exists() { - return Err(Error::cache_error_with_seq(CacheErrorKind::FileDoesNotExist, sequence)); + return Err(Error::cache_error_with_seq(CacheErrorKind::FileDoesNotExist, sequence)) } extract_tx_envelope_from_path(path).map(|(tx, _)| tx) @@ -251,7 +251,7 @@ impl WalletStateStorage { // return an error if all the files have errors. if tx_envelopes.is_empty() && !errors.is_empty() { - return Err(errors); + return Err(errors) } // sort in ascending order, based on the sequence number. @@ -290,7 +290,7 @@ fn extract_tx_envelope_from_path + std::fmt::Debug + Clone>( // convert the content into `Vec` let Some(content_as_vec_u8) = parse_xdr_string_to_vec_u8(&content_from_file) else { - return Err(Error::cache_error_with_path(CacheErrorKind::InvalidFile, format!("{path:?}"))); + return Err(Error::cache_error_with_path(CacheErrorKind::InvalidFile, format!("{path:?}"))) }; // convert the content to TransactionEnvelope diff --git a/pallets/currency/src/amount.rs b/pallets/currency/src/amount.rs index 4b69e1fb7..bfb7dd8be 100644 --- a/pallets/currency/src/amount.rs +++ b/pallets/currency/src/amount.rs @@ -92,7 +92,7 @@ mod math { pub fn ensure_is_compatible_with_target_chain(&self) -> Result<(), DispatchError> { if !T::AmountCompatibility::is_compatible_with_target(self.amount) { - return Err(Error::::IncompatibleAmount.into()); + return Err(Error::::IncompatibleAmount.into()) } Ok(()) } @@ -115,7 +115,7 @@ mod math { F: Fn(&BalanceOf, &BalanceOf) -> Option>, { if self.currency_id != other.currency_id { - return Err(Error::::InvalidCurrency.into()); + return Err(Error::::InvalidCurrency.into()) } let amount = f(&self.amount, &other.amount).ok_or(err)?; diff --git a/pallets/oracle/src/dia.rs b/pallets/oracle/src/dia.rs index 4e92c2c55..ccb52b36d 100644 --- a/pallets/oracle/src/dia.rs +++ b/pallets/oracle/src/dia.rs @@ -143,7 +143,7 @@ where let value = ConvertPrice::convert(coin_info.price)?; let Some(timestamp) = ConvertMoment::convert(coin_info.last_update_timestamp) else { - return None; + return None }; Some(TimestampedValue { value, timestamp }) diff --git a/pallets/oracle/src/lib.rs b/pallets/oracle/src/lib.rs index c766ac301..0d7ba2f81 100644 --- a/pallets/oracle/src/lib.rs +++ b/pallets/oracle/src/lib.rs @@ -294,7 +294,7 @@ impl Pallet { ext::security::ensure_parachain_status_running::()?; let Some(price) = T::DataProvider::get_no_op(&key) else { - return Err(Error::::MissingExchangeRate.into()); + return Err(Error::::MissingExchangeRate.into()) }; Ok(price.value) } @@ -360,7 +360,7 @@ impl Pallet { to_decimals: u32, ) -> Result, DispatchError> { if from_amount.is_zero() { - return Ok(Zero::zero()); + return Ok(Zero::zero()) } let from_amount = T::UnsignedFixedPoint::from_inner(from_amount); diff --git a/pallets/pooled-rewards/src/lib.rs b/pallets/pooled-rewards/src/lib.rs index c2f095fb5..b60fe6921 100644 --- a/pallets/pooled-rewards/src/lib.rs +++ b/pallets/pooled-rewards/src/lib.rs @@ -278,7 +278,7 @@ impl, I: 'static> Pallet { reward: SignedFixedPoint, ) -> DispatchResult { if reward.is_zero() { - return Ok(()); + return Ok(()) } let total_stake = Self::total_stake(pool_id); ensure!(!total_stake.is_zero(), Error::::ZeroTotalStake); @@ -325,7 +325,7 @@ impl, I: 'static> Pallet { amount: SignedFixedPoint, ) -> Result<(), DispatchError> { if amount > Self::stake(pool_id, stake_id) { - return Err(Error::::InsufficientFunds.into()); + return Err(Error::::InsufficientFunds.into()) } checked_sub_mut!(Stake, (pool_id, stake_id), &amount); @@ -542,7 +542,7 @@ where pool_vec.push((pool_id, pool_stake_as_balance)); } - return Ok(pool_vec); + return Ok(pool_vec) } } diff --git a/pallets/reward-distribution/src/lib.rs b/pallets/reward-distribution/src/lib.rs index df91cdad2..7223db8ce 100644 --- a/pallets/reward-distribution/src/lib.rs +++ b/pallets/reward-distribution/src/lib.rs @@ -207,11 +207,11 @@ pub mod pallet { ext::staking::compute_reward::(&vault_id, &caller, reward_currency_id)?; if expected_rewards == BalanceOf::::zero() { - return Err(Error::::NoRewardsForAccount.into()); + return Err(Error::::NoRewardsForAccount.into()) } if expected_rewards < minimum_transfer_amount { - return Err(Error::::CollectAmountTooSmall.into()); + return Err(Error::::CollectAmountTooSmall.into()) } //withdraw the reward for specific nominator @@ -219,7 +219,7 @@ pub mod pallet { ext::staking::withdraw_reward::(&vault_id, &caller, index, reward_currency_id)?; if caller_rewards == (BalanceOf::::zero()) { - return Err(Error::::NoRewardsForAccount.into()); + return Err(Error::::NoRewardsForAccount.into()) } //transfer rewards @@ -242,7 +242,7 @@ impl Pallet { None => { // Pay the whole reward from the fee pool let amount: currency::Amount = Amount::new(reward, reward_currency_id); - return amount.transfer(&Self::fee_pool_account_id(), &beneficiary); + return amount.transfer(&Self::fee_pool_account_id(), &beneficiary) }, Some(remaining) => { //check if the to-be-minted amount is consistent @@ -251,7 +251,7 @@ impl Pallet { .ok_or(Error::::NotEnoughRewardsRegistered)?; if liability < remaining { - return Err(Error::::NotEnoughRewardsRegistered.into()); + return Err(Error::::NotEnoughRewardsRegistered.into()) } // Use the available funds from the fee pool @@ -277,7 +277,7 @@ impl Pallet { pub fn execute_on_init(_height: T::BlockNumber) { if let Err(_) = ext::security::ensure_parachain_status_running::() { - return; + return } //get reward per block @@ -285,7 +285,7 @@ impl Pallet { Some(value) => value, None => { log::warn!("Reward per block is None"); - return; + return }, }; @@ -293,7 +293,7 @@ impl Pallet { Some(value) => value, None => { log::warn!("RewardsAdaptedAt is None"); - return; + return }, }; diff --git a/testchain/runtime/mainnet/src/lib.rs b/testchain/runtime/mainnet/src/lib.rs index ef5aa04d2..e1300af48 100644 --- a/testchain/runtime/mainnet/src/lib.rs +++ b/testchain/runtime/mainnet/src/lib.rs @@ -489,9 +489,9 @@ impl XCMCurrencyConversion for SpacewalkNativeCurrencyKey { fn convert_from_dia_currency_id(blockchain: Vec, symbol: Vec) -> Option { // We assume that the blockchain is always 0 and the symbol represents the token symbol if blockchain.len() != 1 && blockchain[0] != 0 || symbol.len() != 1 { - return None; + return None } - return Some(symbol[0]); + return Some(symbol[0]) } } diff --git a/testchain/runtime/testnet/src/lib.rs b/testchain/runtime/testnet/src/lib.rs index 62868f3c8..a2fdf3762 100644 --- a/testchain/runtime/testnet/src/lib.rs +++ b/testchain/runtime/testnet/src/lib.rs @@ -478,9 +478,9 @@ impl XCMCurrencyConversion for SpacewalkNativeCurrencyKey { fn convert_from_dia_currency_id(blockchain: Vec, symbol: Vec) -> Option { // We assume that the blockchain is always 0 and the symbol represents the token symbol if blockchain.len() != 1 && blockchain[0] != 0 || symbol.len() != 1 { - return None; + return None } - return Some(symbol[0]); + return Some(symbol[0]) } } From 4f3fed950cf2fa94762be00be68a416aa848de45 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Fri, 17 May 2024 16:00:27 +0200 Subject: [PATCH 19/26] Refactor error handling around `try_get_release()` --- clients/runner/src/runner.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index 6a4943712..e80312023 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -360,19 +360,20 @@ impl Runner { loop { runner.maybe_restart_client()?; - match runner.try_get_release().await? { - None => { + match runner.try_get_release().await { + Err(error) => { // Create new RPC client, assuming it's a websocket connection error. // We can't detect if it's a websocket error (https://github.com/paritytech/subxt/issues/1190) // so we just close and reopen the connection. // replace with https://github.com/pendulum-chain/spacewalk/issues/521 eventually - log::info!("Could not get release, reopening connection to RPC endpoint..."); + log::error!("Error getting release: {}", error); + log::info!("Reopening connection to RPC endpoint..."); match runner.reopen_subxt_api().await { Ok(_) => log::info!("Connection to RPC endpoint reopened"), Err(e) => log::error!("Failed to reopen connection: {}", e), } }, - Some(new_release) => { + Ok(Some(new_release)) => { let maybe_downloaded_release = runner.downloaded_release(); let downloaded_release = maybe_downloaded_release.as_ref().ok_or(Error::NoDownloadedRelease)?; @@ -394,6 +395,7 @@ impl Runner { runner.run_binary()?; } }, + _ => (), } tokio::time::sleep(BLOCK_TIME).await; } From 18d8746d4f411353a7ab49e80a610e6137f507a2 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 22 May 2024 17:31:09 +0200 Subject: [PATCH 20/26] Remove patch statement for `ahash` again --- Cargo.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b96a1753f..d1ed5e207 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -154,8 +154,4 @@ xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9. [patch.crates-io] sp-core = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } - -# We need to patch this to https://github.com/tkaitchuck/aHash/releases/tag/v0.8.11 to prevent a build error -# 'error[E0635]: unknown feature `stdsimd`' that occurs because this feature was removed in the latest nightly versions -ahash = { git = "https://github.com/tkaitchuck/aHash", rev = "db36e4c4f0606b786bc617eefaffbe4ae9100762" } \ No newline at end of file +sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } \ No newline at end of file From 4e8b51601a021fe31e0413e79bc5edcfbfc5e2ac Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 22 May 2024 17:31:22 +0200 Subject: [PATCH 21/26] Remove patch statement for `ahash` again --- Cargo.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 32779eb3c..b291ebdb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -161,7 +161,8 @@ dependencies = [ [[package]] name = "ahash" version = "0.8.11" -source = "git+https://github.com/tkaitchuck/aHash?rev=db36e4c4f0606b786bc617eefaffbe4ae9100762#db36e4c4f0606b786bc617eefaffbe4ae9100762" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.15", @@ -549,7 +550,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -7018,7 +7019,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] From 287116c91b0a52adc73a3f4c9ddc1364886a2062 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 22 May 2024 17:33:09 +0200 Subject: [PATCH 22/26] Replace references to `nightly-02-09` with `nightly-04-18` --- .github/workflows/ci-dev.yml | 12 ++++----- .github/workflows/ci-main.yml | 14 +++++------ .maintain/add-prepush-hook.sh | 2 +- README.md | 46 ++++++++++++++++++++++++----------- 4 files changed, 46 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml index 60ba36601..16b14889a 100644 --- a/.github/workflows/ci-dev.yml +++ b/.github/workflows/ci-dev.yml @@ -12,7 +12,7 @@ jobs: max-parallel: 1 matrix: os: [ ubuntu-latest, macos-latest ] - rust: [stable, nightly] + rust: [ stable, nightly ] include: - os: ubuntu-latest sccache-path: /home/runner/.cache/sccache @@ -67,15 +67,15 @@ jobs: - name: Setup nightly Rust toolchain if: matrix.rust == 'nightly' - uses: dtolnay/rust-toolchain@nightly + uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2024-02-09 + toolchain: nightly-2024-04-18 components: rustfmt, clippy target: wasm32-unknown-unknown - name: Setup nightly Rust as default if: matrix.rust == 'nightly' - run: rustup default nightly-2024-02-09 + run: rustup default nightly-2024-04-18 - name: Use Cache uses: Swatinem/rust-cache@v2 @@ -114,7 +114,7 @@ jobs: DEST_STELLAR_SECRET_MAINNET: ${{ secrets.DEST_STELLAR_SECRET_MAINNET }} DEST_STELLAR_SECRET_TESTNET: ${{ secrets.DEST_STELLAR_SECRET_TESTNET }} with: - toolchain: nightly-2024-02-09 + toolchain: nightly-2024-04-18 command: test args: --all --all-features @@ -122,7 +122,7 @@ jobs: if: matrix.rust == 'nightly' uses: actions-rs/cargo@v1 with: - toolchain: nightly-2024-02-09 + toolchain: nightly-2024-04-18 command: fmt args: --all -- --check diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 89d2886aa..0178bac07 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -9,7 +9,7 @@ jobs: strategy: max-parallel: 1 matrix: - rust: [stable, nightly] + rust: [ stable, nightly ] runs-on: ubuntu-20.04 env: RUST_BACKTRACE: full @@ -53,15 +53,15 @@ jobs: - name: Setup nightly Rust toolchain if: matrix.rust == 'nightly' - uses: dtolnay/rust-toolchain@nightly + uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2024-02-09 + toolchain: nightly-2024-04-18 components: rustfmt, clippy target: wasm32-unknown-unknown - name: Setup nightly Rust as default if: matrix.rust == 'nightly' - run: rustup default nightly-2024-02-09 + run: rustup default nightly-2024-04-18 - name: Use Cache uses: Swatinem/rust-cache@v2 @@ -89,7 +89,7 @@ jobs: DEST_STELLAR_SECRET_MAINNET: ${{ secrets.DEST_STELLAR_SECRET_MAINNET }} DEST_STELLAR_SECRET_TESTNET: ${{ secrets.DEST_STELLAR_SECRET_TESTNET }} with: - toolchain: nightly-2024-02-09 + toolchain: nightly-2024-04-18 command: test args: --all --all-features @@ -97,7 +97,7 @@ jobs: if: matrix.rust == 'nightly' uses: actions-rs/cargo@v1 with: - toolchain: nightly-2024-02-09 + toolchain: nightly-2024-04-18 command: fmt args: --all -- --check @@ -110,6 +110,6 @@ jobs: if: matrix.rust == 'nightly' uses: actions-rs/cargo@v1 with: - toolchain: nightly-2024-02-09 + toolchain: nightly-2024-04-18 command: clippy args: --all-features --tests --benches --examples -- -A clippy::all -W clippy::correctness -A forgetting_copy_types -A forgetting_references \ No newline at end of file diff --git a/.maintain/add-prepush-hook.sh b/.maintain/add-prepush-hook.sh index 060399eb6..1282fe5a3 100755 --- a/.maintain/add-prepush-hook.sh +++ b/.maintain/add-prepush-hook.sh @@ -14,7 +14,7 @@ chmod +x ./scripts/cmd-all ./scripts/cmd-all clippy "clippy --lib --bins" "-- -W clippy::all -A clippy::style -A forgetting_copy_types -A forgetting_references" echo "Running clippy for all targets" -cargo +nightly-2024-02-09 clippy --all-features --all-targets -- -A clippy::all -W clippy::correctness -A clippy::forget_copy -A clippy::forget_ref +cargo +nightly-2024-04-18 clippy --all-features --all-targets -- -A clippy::all -W clippy::correctness -A clippy::forget_copy -A clippy::forget_ref CLIPPY_EXIT_CODE=$? diff --git a/README.md b/README.md index ff6fc98cd..b98bdba07 100644 --- a/README.md +++ b/README.md @@ -74,10 +74,14 @@ specified in the redeem event. The handling of redeem events is implemented in `clients/vault/src/redeem.rs`. # Build and Run -There was a [plan to replace Rust `nightly` version with the stable version](https://github.com/pendulum-chain/spacewalk/issues/506). + +There was +a [plan to replace Rust `nightly` version with the stable version](https://github.com/pendulum-chain/spacewalk/issues/506). The [default toolchain](./rust-toolchain.toml) is set to stable. However, the [pallet `currency`](./pallets/currency)'s -feature _`testing-utils`_ is using [**`mocktopus`**](https://docs.rs/mocktopus/latest/mocktopus/#) — a `nightly` only lib — and will potentially break your IDEs: +feature _`testing-utils`_ is using [**`mocktopus`**](https://docs.rs/mocktopus/latest/mocktopus/#) — a `nightly` only +lib — and will potentially break your IDEs: + ``` error[E0554]: `#![feature]` may not be used on the stable release channel --> /.../registry/src/index.crates.io-6f17d22bba15001f/mocktopus_macros-0.7.11/src/lib.rs:6:12 @@ -85,11 +89,15 @@ error[E0554]: `#![feature]` may not be used on the stable release channel 6 | #![feature(proc_macro_diagnostic)] | ^^^^^^^^^^^^^^^^^^^^^ ``` -Building and testing is _different_. The `testing-utils` feature is for testing _**only**_, and **_requires_** **_`nightly`_**. + +Building and testing is _different_. The `testing-utils` feature is for testing _**only**_, and **_requires_** * +*_`nightly`_**. ## Run all tests -To run the tests, use the Rust **nightly** version; minimum is `nightly-2024-02-09`. -This allows [`mocktopus`](https://docs.rs/mocktopus/latest/mocktopus/#) to be used freely across all packages during testing. + +To run the tests, use the Rust **nightly** version; minimum is `nightly-2024-04-18`. +This allows [`mocktopus`](https://docs.rs/mocktopus/latest/mocktopus/#) to be used freely across all packages during +testing. ``` cargo +nightly test --lib --features standalone-metadata -- --nocapture @@ -108,23 +116,29 @@ cargo run --bin spacewalk-standalone --release -- --dev ``` ## [`cmd-all` script](./scripts/cmd-all) -The `--all`, `--all-features` and `--all-target` flags _cannot be used_, as [mentioned previously about the `currency` pallet's `testing-utils` feature](#Build-and-Run). + +The `--all`, `--all-features` and `--all-target` flags _cannot be used_, +as [mentioned previously about the `currency` pallet's `testing-utils` feature](#Build-and-Run). The following commands (executed at the root directory) will **FAIL**: + * `cargo build --all-features ` * `cargo clippy --all-targets` -This "apply to all" script is necessary to execute a command across _all_ packages _**individually**_, adding the required conditions to some. +This "apply to all" script is necessary to execute a command across _all_ packages _**individually**_, adding the +required conditions to some. [Check the script on how it looks like](./scripts/cmd-all). - -**_note_**: This has been tested with only 2 commands in the [CI workflow](.github/workflows/ci-main.yml): `check` and `clippy`. Other commands might not work. +**_note_**: This has been tested with only 2 commands in the [CI workflow](.github/workflows/ci-main.yml): `check` +and `clippy`. Other commands might not work. # Development -To ease the maintenance of proper code formatting and good practices, please consider installing the pre-commit hook and/or the pre-push hook contained in this +To ease the maintenance of proper code formatting and good practices, please consider installing the pre-commit hook +and/or the pre-push hook contained in this repository. -The pre-commit hook runs `rustfmt` on all the changed files in a commit, to ensure that changed files are properly formatted +The pre-commit hook runs `rustfmt` on all the changed files in a commit, to ensure that changed files are properly +formatted before committing. You can install the hook by running the following commands. @@ -132,18 +146,22 @@ You can install the hook by running the following commands. .maintain/add-precommit-hook.sh ``` -The pre-push hool runs clippy checks that are also performed in the CI of the repository. These checks need to be successful so the push actually happens. +The pre-push hool runs clippy checks that are also performed in the CI of the repository. These checks need to be +successful so the push actually happens. Otherwise, pelase run the corresponding clippy fix command or manually fix the issue. To install the hook, run: + ``` .maintain/add-prepush-hook.sh ``` To ignore the checks once the hook has been installed, run `git push --no-verify`. -### Note -You may need to make the hook script executable. Pleas run `chmod u+x .git/hooks/pre-push`, `chmod u+x .git/hooks/pre-commit` if necessary. +### Note + +You may need to make the hook script executable. Pleas +run `chmod u+x .git/hooks/pre-push`, `chmod u+x .git/hooks/pre-commit` if necessary. # Releases From 1409157e858b71559b0df0636ec76acf8d528ac5 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 22 May 2024 17:40:05 +0200 Subject: [PATCH 23/26] Don't log message for each retry --- clients/runner/src/runner.rs | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/clients/runner/src/runner.rs b/clients/runner/src/runner.rs index e80312023..00372a8e1 100644 --- a/clients/runner/src/runner.rs +++ b/clients/runner/src/runner.rs @@ -622,23 +622,19 @@ pub fn retry_with_log(mut f: F, log_msg: String) -> Result where F: FnMut() -> Result, { - // For debugging purposes - let mut counter = 0; - // We store the error to return it if the backoff is exhausted let mut error = None; // We retry for the number of retries calculated based on the `RETRY_TIMEOUT` and // `RETRY_INTERVAL` let retries = RETRY_TIMEOUT.as_secs().checked_div(RETRY_INTERVAL.as_secs()).unwrap_or(1); - for _ in 0..retries { + for index in 0..retries { match f() { Ok(result) => return Ok(result), Err(err) => { - log::info!("{}: {}. Retrying...", log_msg, err.to_string()); - - log::debug!("Retry attempt: {}", counter); - counter += 1; + if index == 0 { + log::warn!("{}: {}. Retrying...", log_msg, err.to_string()); + } std::thread::sleep(RETRY_INTERVAL); error = Some(err) @@ -646,7 +642,10 @@ where } } - Err(error.expect("Error should not be None if we reach here.")) + let error = error.expect("Error should not be None if we reach here."); + log::warn!("{}: {}. Retries exhausted.", log_msg, error.to_string()); + + Err(error) } pub async fn retry_with_log_async<'a, T, F, E>(f: F, log_msg: String) -> Result @@ -654,23 +653,19 @@ where F: Fn() -> BoxFuture<'a, Result>, E: Into + Sized + Display, { - // For debugging purposes - let mut counter = 0; - // We store the error to return it if the backoff is exhausted let mut error = None; // We retry for the number of retries calculated based on the `RETRY_TIMEOUT` and // `RETRY_INTERVAL` let retries = RETRY_TIMEOUT.as_secs().checked_div(RETRY_INTERVAL.as_secs()).unwrap_or(1); - for _ in 0..retries { + for index in 0..retries { match f().await { Ok(result) => return Ok(result), Err(err) => { - log::info!("{}: {}. Retrying...", log_msg, err.to_string()); - - log::debug!("Retry attempt: {}", counter); - counter += 1; + if index == 0 { + log::warn!("{}: {}. Retrying...", log_msg, err.to_string()); + } tokio::time::sleep(RETRY_INTERVAL).await; error = Some(err) @@ -678,7 +673,10 @@ where } } - Err(error.expect("Error should not be None if we reach here.").into()) + let error = error.expect("Error should not be None if we reach here."); + log::warn!("{}: {}. Retries exhausted.", log_msg, error.to_string()); + + Err(error.into()) } #[cfg(test)] From 64c7c9a2bd962210a164a4de931d4c0a96968bdf Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Wed, 22 May 2024 18:46:10 +0200 Subject: [PATCH 24/26] Change `max-parallel` to `2` as there is no reason not to parallelize the jobs anymore --- .github/workflows/ci-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 0178bac07..ee077fb90 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -7,7 +7,7 @@ name: continuous-integration-main jobs: ci: strategy: - max-parallel: 1 + max-parallel: 2 matrix: rust: [ stable, nightly ] runs-on: ubuntu-20.04 From cabd7f0b69c39c96532c52685f7199823e4c0e26 Mon Sep 17 00:00:00 2001 From: Marcel Ebert Date: Thu, 23 May 2024 16:52:17 +0200 Subject: [PATCH 25/26] Add some 'allow' statements for clippy --- clients/wallet/src/horizon/responses.rs | 3 ++- testchain/runtime/mainnet/src/lib.rs | 5 +++-- testchain/runtime/testnet/src/lib.rs | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/clients/wallet/src/horizon/responses.rs b/clients/wallet/src/horizon/responses.rs index 0c2c76e65..a78cb12cc 100644 --- a/clients/wallet/src/horizon/responses.rs +++ b/clients/wallet/src/horizon/responses.rs @@ -359,9 +359,10 @@ impl HorizonBalance { } // The following structs represent the whole response when fetching any Horizon API -// for retreiving a list of claimable balances for an account +// for retrieving a list of claimable balances for an account #[derive(Deserialize, Debug)] pub struct EmbeddedClaimableBalance { + #[allow(dead_code)] pub records: Vec, } diff --git a/testchain/runtime/mainnet/src/lib.rs b/testchain/runtime/mainnet/src/lib.rs index e1300af48..831f58fa1 100644 --- a/testchain/runtime/mainnet/src/lib.rs +++ b/testchain/runtime/mainnet/src/lib.rs @@ -489,9 +489,9 @@ impl XCMCurrencyConversion for SpacewalkNativeCurrencyKey { fn convert_from_dia_currency_id(blockchain: Vec, symbol: Vec) -> Option { // We assume that the blockchain is always 0 and the symbol represents the token symbol if blockchain.len() != 1 && blockchain[0] != 0 || symbol.len() != 1 { - return None + return None; } - return Some(symbol[0]) + return Some(symbol[0]); } } @@ -878,6 +878,7 @@ impl_runtime_apis! { (list, storage_info) } + #[allow(non_local_definitions)] fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { diff --git a/testchain/runtime/testnet/src/lib.rs b/testchain/runtime/testnet/src/lib.rs index a2fdf3762..754ab36ba 100644 --- a/testchain/runtime/testnet/src/lib.rs +++ b/testchain/runtime/testnet/src/lib.rs @@ -478,9 +478,9 @@ impl XCMCurrencyConversion for SpacewalkNativeCurrencyKey { fn convert_from_dia_currency_id(blockchain: Vec, symbol: Vec) -> Option { // We assume that the blockchain is always 0 and the symbol represents the token symbol if blockchain.len() != 1 && blockchain[0] != 0 || symbol.len() != 1 { - return None + return None; } - return Some(symbol[0]) + return Some(symbol[0]); } } @@ -868,6 +868,7 @@ impl_runtime_apis! { (list, storage_info) } + #[allow(non_local_definitions)] fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { From dc2407f91855f01cac3e72990b78cd5eb85a0a04 Mon Sep 17 00:00:00 2001 From: b-yap <2826165+b-yap@users.noreply.github.com> Date: Fri, 24 May 2024 14:57:41 +0800 Subject: [PATCH 26/26] revert version to 2024-02-09 --- .github/workflows/ci-dev.yml | 8 +- .github/workflows/ci-main.yml | 10 +- .maintain/add-prepush-hook.sh | 2 +- Cargo.lock | 341 +++++++++++++-------------- README.md | 2 +- testchain/runtime/mainnet/src/lib.rs | 1 - testchain/runtime/testnet/src/lib.rs | 1 - 7 files changed, 175 insertions(+), 190 deletions(-) diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml index 16b14889a..3214614f0 100644 --- a/.github/workflows/ci-dev.yml +++ b/.github/workflows/ci-dev.yml @@ -69,13 +69,13 @@ jobs: if: matrix.rust == 'nightly' uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2024-04-18 + toolchain: nightly-2024-02-09 components: rustfmt, clippy target: wasm32-unknown-unknown - name: Setup nightly Rust as default if: matrix.rust == 'nightly' - run: rustup default nightly-2024-04-18 + run: rustup default nightly-2024-02-09 - name: Use Cache uses: Swatinem/rust-cache@v2 @@ -114,7 +114,7 @@ jobs: DEST_STELLAR_SECRET_MAINNET: ${{ secrets.DEST_STELLAR_SECRET_MAINNET }} DEST_STELLAR_SECRET_TESTNET: ${{ secrets.DEST_STELLAR_SECRET_TESTNET }} with: - toolchain: nightly-2024-04-18 + toolchain: nightly-2024-02-09 command: test args: --all --all-features @@ -122,7 +122,7 @@ jobs: if: matrix.rust == 'nightly' uses: actions-rs/cargo@v1 with: - toolchain: nightly-2024-04-18 + toolchain: nightly-2024-02-09 command: fmt args: --all -- --check diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index ee077fb90..121fbcc07 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -55,13 +55,13 @@ jobs: if: matrix.rust == 'nightly' uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2024-04-18 + toolchain: nightly-2024-02-09 components: rustfmt, clippy target: wasm32-unknown-unknown - name: Setup nightly Rust as default if: matrix.rust == 'nightly' - run: rustup default nightly-2024-04-18 + run: rustup default nightly-2024-02-09 - name: Use Cache uses: Swatinem/rust-cache@v2 @@ -89,7 +89,7 @@ jobs: DEST_STELLAR_SECRET_MAINNET: ${{ secrets.DEST_STELLAR_SECRET_MAINNET }} DEST_STELLAR_SECRET_TESTNET: ${{ secrets.DEST_STELLAR_SECRET_TESTNET }} with: - toolchain: nightly-2024-04-18 + toolchain: nightly-2024-02-09 command: test args: --all --all-features @@ -97,7 +97,7 @@ jobs: if: matrix.rust == 'nightly' uses: actions-rs/cargo@v1 with: - toolchain: nightly-2024-04-18 + toolchain: nightly-2024-02-09 command: fmt args: --all -- --check @@ -110,6 +110,6 @@ jobs: if: matrix.rust == 'nightly' uses: actions-rs/cargo@v1 with: - toolchain: nightly-2024-04-18 + toolchain: nightly-2024-02-09 command: clippy args: --all-features --tests --benches --examples -- -A clippy::all -W clippy::correctness -A forgetting_copy_types -A forgetting_references \ No newline at end of file diff --git a/.maintain/add-prepush-hook.sh b/.maintain/add-prepush-hook.sh index 1282fe5a3..060399eb6 100755 --- a/.maintain/add-prepush-hook.sh +++ b/.maintain/add-prepush-hook.sh @@ -14,7 +14,7 @@ chmod +x ./scripts/cmd-all ./scripts/cmd-all clippy "clippy --lib --bins" "-- -W clippy::all -A clippy::style -A forgetting_copy_types -A forgetting_references" echo "Running clippy for all targets" -cargo +nightly-2024-04-18 clippy --all-features --all-targets -- -A clippy::all -W clippy::correctness -A clippy::forget_copy -A clippy::forget_ref +cargo +nightly-2024-02-09 clippy --all-features --all-targets -- -A clippy::all -W clippy::correctness -A clippy::forget_copy -A clippy::forget_ref CLIPPY_EXIT_CODE=$? diff --git a/Cargo.lock b/Cargo.lock index b291ebdb4..976739377 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -261,9 +261,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "approx" @@ -406,12 +406,11 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite 0.2.14", @@ -436,7 +435,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.2.1", + "async-channel 2.3.1", "async-executor", "async-io 2.3.2", "async-lock 3.3.0", @@ -550,7 +549,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -567,7 +566,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -889,7 +888,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.2.1", + "async-channel 2.3.1", "async-lock 3.3.0", "async-task", "futures-io", @@ -960,9 +959,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -1025,9 +1024,9 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] @@ -1057,9 +1056,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", @@ -1266,7 +1265,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1344,8 +1343,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ "futures-core", - "prost 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "tonic", "tracing-core", ] @@ -1362,7 +1361,7 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime 2.1.0", - "prost-types 0.12.4", + "prost-types 0.12.6", "serde", "serde_json", "thread_local", @@ -1527,7 +1526,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.5", "log", "smallvec", "wasmparser", @@ -1551,18 +1550,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1588,9 +1587,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1761,14 +1760,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "cxx" -version = "1.0.121" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21db378d04296a84d8b7d047c36bb3954f0b46529db725d7e62fb02f9ba53ccc" +checksum = "bb497fad022245b29c2a0351df572e2d67c1046bcef2260ebc022aec81efea82" dependencies = [ "cc", "cxxbridge-flags", @@ -1778,9 +1777,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.121" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5262a7fa3f0bae2a55b767c223ba98032d7c328f5c13fa5cdc980b77fc0658" +checksum = "9327c7f9fbd6329a200a5d4aa6f674c60ab256525ff0084b52a889d4e4c60cee" dependencies = [ "cc", "codespan-reporting", @@ -1788,24 +1787,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "cxxbridge-flags" -version = "1.0.121" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8dcadd2e2fb4a501e1d9e93d6e88e6ea494306d8272069c92d5a9edf8855c0" +checksum = "688c799a4a846f1c0acb9f36bb9c6272d9b3d9457f3633c7753c6057270df13c" [[package]] name = "cxxbridge-macro" -version = "1.0.121" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad08a837629ad949b73d032c637653d069e909cffe4ee7870b02301939ce39cc" +checksum = "928bc249a7e3cd554fd2e8e08a426e9670c50bbfc9a621653cfa9accc9641783" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1820,12 +1819,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1844,16 +1843,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.61", + "strsim 0.11.1", + "syn 2.0.66", ] [[package]] @@ -1869,13 +1868,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.9", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2157,7 +2156,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2307,9 +2306,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elliptic-curve" @@ -2453,9 +2452,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2619,9 +2618,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "file-per-thread-logger" @@ -2811,7 +2810,7 @@ dependencies = [ "frame-system", "gethostname", "handlebars", - "itertools", + "itertools 0.10.5", "lazy_static", "linked-hash-map", "log", @@ -2913,11 +2912,11 @@ dependencies = [ "cfg-expr", "derive-syn-parse", "frame-support-procedural-tools", - "itertools", + "itertools 0.10.5", "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2929,7 +2928,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2939,7 +2938,7 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -3116,7 +3115,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -3928,9 +3927,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] @@ -4062,6 +4061,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -4388,9 +4396,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -4992,9 +5000,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -5223,9 +5231,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -5820,9 +5828,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -5854,11 +5862,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -5963,7 +5970,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -6323,9 +6330,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -6338,11 +6345,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -6505,7 +6512,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -6521,9 +6528,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap 2.2.6", @@ -6546,7 +6553,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -6569,9 +6576,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -6738,7 +6745,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp 0.9.0", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -6805,15 +6812,6 @@ dependencies = [ "toml 0.5.11", ] -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -6861,14 +6859,14 @@ checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] @@ -6953,12 +6951,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.5", + "prost-derive 0.12.6", ] [[package]] @@ -6969,7 +6967,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck 0.4.1", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -7003,7 +7001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -7011,15 +7009,15 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9554e3ab233f0a932403704f1a1d08c30d5ccd931adfdfa1e8b5a19b52c1d55a" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -7033,11 +7031,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.4", + "prost 0.12.6", ] [[package]] @@ -7396,7 +7394,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -7874,7 +7872,7 @@ dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -7948,9 +7946,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rw-stream-sink" @@ -8063,7 +8061,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -8958,7 +8956,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -9098,9 +9096,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.11.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c453e59a955f81fb62ee5d596b450383d699f152d350e9d23a0db2adb78e4c0" +checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -9112,11 +9110,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.11.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18cf6c6447f813ef19eb450e985bcce6705f9ce7660db221b59093d15c79c4b7" +checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -9170,9 +9168,9 @@ dependencies = [ [[package]] name = "schnellru" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" +checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" dependencies = [ "ahash 0.8.11", "cfg-if 1.0.0", @@ -9391,29 +9389,29 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -9422,9 +9420,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -9463,10 +9461,10 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.8", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -9794,7 +9792,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -10019,7 +10017,7 @@ dependencies = [ "proc-macro2", "quote", "sp-core-hashing 5.0.0", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -10038,7 +10036,7 @@ source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#f dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -10217,7 +10215,7 @@ dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -10391,7 +10389,7 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -11074,7 +11072,7 @@ dependencies = [ "quote", "scale-info", "subxt-metadata 0.29.0", - "syn 2.0.61", + "syn 2.0.66", "thiserror", "tokio", ] @@ -11097,10 +11095,10 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e544e41e1c84b616632cd2f86862342868f62e11e4cd9062a9e3dbf5fc871f64" dependencies = [ - "darling 0.20.8", + "darling 0.20.9", "proc-macro-error", "subxt-codegen 0.29.0", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -11141,9 +11139,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.61" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -11276,22 +11274,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -11442,7 +11440,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -11547,9 +11545,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -11567,17 +11565,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -11607,7 +11594,7 @@ dependencies = [ "hyper-timeout", "percent-encoding 2.3.1", "pin-project", - "prost 0.12.4", + "prost 0.12.6", "tokio", "tokio-stream", "tower", @@ -11686,7 +11673,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -12100,7 +12087,7 @@ dependencies = [ "futures 0.3.30", "governor", "hex", - "itertools", + "itertools 0.10.5", "jsonrpc-core", "jsonrpc-core-client", "lazy_static", @@ -12217,9 +12204,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -12334,7 +12321,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -12368,7 +12355,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -12934,9 +12921,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.17" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0e39d2c603fdc0504b12b458cf1f34e0b937ed2f4f2dc20796e3e86f34e11f" +checksum = "21e005a4cc35784183a9e39cb22e9a9c46353ef6a7f113fd8d36ddc58c15ef3c" dependencies = [ "bytemuck", "safe_arch", @@ -13339,7 +13326,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -13394,7 +13381,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -13414,7 +13401,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] diff --git a/README.md b/README.md index b98bdba07..92959c704 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ Building and testing is _different_. The `testing-utils` feature is for testing ## Run all tests -To run the tests, use the Rust **nightly** version; minimum is `nightly-2024-04-18`. +To run the tests, use the Rust **nightly** version; minimum is `nightly-2024-02-09`. This allows [`mocktopus`](https://docs.rs/mocktopus/latest/mocktopus/#) to be used freely across all packages during testing. diff --git a/testchain/runtime/mainnet/src/lib.rs b/testchain/runtime/mainnet/src/lib.rs index 831f58fa1..ef5aa04d2 100644 --- a/testchain/runtime/mainnet/src/lib.rs +++ b/testchain/runtime/mainnet/src/lib.rs @@ -878,7 +878,6 @@ impl_runtime_apis! { (list, storage_info) } - #[allow(non_local_definitions)] fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { diff --git a/testchain/runtime/testnet/src/lib.rs b/testchain/runtime/testnet/src/lib.rs index 754ab36ba..62868f3c8 100644 --- a/testchain/runtime/testnet/src/lib.rs +++ b/testchain/runtime/testnet/src/lib.rs @@ -868,7 +868,6 @@ impl_runtime_apis! { (list, storage_info) } - #[allow(non_local_definitions)] fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> {