From 6621d706542035bb29d52f72b01ec49385f7dd46 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Wed, 23 Aug 2023 10:18:49 +0200 Subject: [PATCH] Remove dependency on `safe-regex` for `regex` (#3556) * Remove dependency on `safe-regex` for `regex` * Add changelog entry * Fix regex for coin --- .../3549-ibc-relayer-types-docs.md | 2 + Cargo.lock | 49 +--- crates/relayer-types/Cargo.toml | 2 +- .../src/applications/transfer/coin.rs | 48 ++-- .../src/applications/transfer/error.rs | 2 +- .../src/core/ics24_host/identifier.rs | 8 +- crates/relayer-types/src/timestamp.rs | 2 +- crates/relayer/Cargo.toml | 2 +- tools/check-guide/Cargo.lock | 264 ++++++------------ 9 files changed, 122 insertions(+), 257 deletions(-) create mode 100644 .changelog/unreleased/bug-fixes/ibc-relayer-types/3549-ibc-relayer-types-docs.md diff --git a/.changelog/unreleased/bug-fixes/ibc-relayer-types/3549-ibc-relayer-types-docs.md b/.changelog/unreleased/bug-fixes/ibc-relayer-types/3549-ibc-relayer-types-docs.md new file mode 100644 index 0000000000..a469afb744 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/ibc-relayer-types/3549-ibc-relayer-types-docs.md @@ -0,0 +1,2 @@ +- Fix build of `ibc-relayer-types` documentation on docs.rs + ([\#3549](https://github.com/informalsystems/hermes/issues/3549)) \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index a6ffaaa4e4..7aac2695b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1594,7 +1594,7 @@ dependencies = [ "num-rational", "primitive-types", "prost", - "safe-regex", + "regex", "serde", "serde_derive", "serde_json", @@ -2731,53 +2731,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" -[[package]] -name = "safe-proc-macro2" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "814c536dcd27acf03296c618dab7ad62d28e70abd7ba41d3f34a2ce707a2c666" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "safe-quote" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e530f7831f3feafcd5f1aae406ac205dd998436b4007c8e80f03eca78a88f7" -dependencies = [ - "safe-proc-macro2", -] - -[[package]] -name = "safe-regex" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15289bf322e0673d52756a18194167f2378ec1a15fe884af6e2d2cb934822b0" -dependencies = [ - "safe-regex-macro", -] - -[[package]] -name = "safe-regex-compiler" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba76fae590a2aa665279deb1f57b5098cbace01a0c5e60e262fcf55f7c51542" -dependencies = [ - "safe-proc-macro2", - "safe-quote", -] - -[[package]] -name = "safe-regex-macro" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c2e96b5c03f158d1b16ba79af515137795f4ad4e8de3f790518aae91f1d127" -dependencies = [ - "safe-proc-macro2", - "safe-regex-compiler", -] - [[package]] name = "same-file" version = "1.0.6" diff --git a/crates/relayer-types/Cargo.toml b/crates/relayer-types/Cargo.toml index 845eab5c59..e890969979 100644 --- a/crates/relayer-types/Cargo.toml +++ b/crates/relayer-types/Cargo.toml @@ -33,7 +33,6 @@ serde_json = { version = "1" } erased-serde = { version = "0.3" } prost = { version = "0.11" } bytes = { version = "1.4.0" } -safe-regex = { version = "0.2.5" } subtle-encoding = { version = "0.5" } flex-error = { version = "0.4.4" } derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] } @@ -42,6 +41,7 @@ itertools = { version = "0.10.3" } primitive-types = { version = "0.12.1", default-features = false, features = ["serde_no_std"] } dyn-clone = "1.0.12" num-rational = "0.4.1" +regex = "1" [dependencies.tendermint] version = "0.33.0" diff --git a/crates/relayer-types/src/applications/transfer/coin.rs b/crates/relayer-types/src/applications/transfer/coin.rs index 29d5d4d91d..5319ea301a 100644 --- a/crates/relayer-types/src/applications/transfer/coin.rs +++ b/crates/relayer-types/src/applications/transfer/coin.rs @@ -1,13 +1,16 @@ -use ibc_proto::cosmos::base::v1beta1::Coin as ProtoCoin; -use safe_regex::regex; -use serde::{Deserialize, Serialize}; use std::fmt::{Display, Error as FmtError, Formatter}; -use std::str::{from_utf8, FromStr}; +use std::str::FromStr; + +use regex::Regex; +use serde::{Deserialize, Serialize}; + +use ibc_proto::cosmos::base::v1beta1::Coin as ProtoCoin; + +use crate::serializers::serde_string; use super::amount::Amount; use super::denom::{BaseDenom, PrefixedDenom}; use super::error::Error; -use crate::serializers::serde_string; /// A `Coin` type with fully qualified `PrefixedDenom`. pub type PrefixedCoin = Coin; @@ -61,24 +64,23 @@ where { type Err = Error; - #[allow(clippy::assign_op_pattern)] + // #[allow(clippy::assign_op_pattern)] fn from_str(coin_str: &str) -> Result { // Denominations can be 3 ~ 128 characters long and support letters, followed by either // a letter, a number or a separator ('/', ':', '.', '_' or '-'). // Loosely copy the regex from here: // https://github.com/cosmos/cosmos-sdk/blob/v0.45.5/types/coin.go#L760-L762 - let matcher = regex!(br"([0-9]+)([a-zA-Z0-9/:\\._\x2d]+)"); - - let (m1, m2) = matcher - .match_slices(coin_str.as_bytes()) - .ok_or_else(|| Error::invalid_coin(coin_str.to_string()))?; + let regex = Regex::new( + r"^(?[0-9]+(?:\.[0-9]+)?|\.[0-9]+)\s*(?[a-zA-Z][a-zA-Z0-9/:._-]{2,127})$", + ) + .expect("failed to compile regex"); - let amount = from_utf8(m1).map_err(Error::utf8_decode)?.parse()?; + let captures = regex.captures(coin_str).ok_or_else(|| { + Error::invalid_coin(format!("{coin_str} (expected format: )")) + })?; - let denom = from_utf8(m2) - .map_err(Error::utf8_decode)? - .parse() - .map_err(Into::into)?; + let amount = captures["amount"].parse()?; + let denom = captures["denom"].parse().map_err(Into::into)?; Ok(Coin { amount, denom }) } @@ -134,14 +136,14 @@ mod tests { } { - let coin = RawCoin::from_str("1a1")?; - assert_eq!(coin.denom, "a1"); + let coin = RawCoin::from_str("1 ab1")?; + assert_eq!(coin.denom, "ab1"); assert_eq!(coin.amount, 1u64.into()); } { - let coin = RawCoin::from_str("0x1/:.\\_-")?; - assert_eq!(coin.denom, "x1/:.\\_-"); + let coin = RawCoin::from_str("0x1/:._-")?; + assert_eq!(coin.denom, "x1/:._-"); assert_eq!(coin.amount, 0u64.into()); } @@ -157,16 +159,16 @@ mod tests { #[test] fn test_parse_raw_coin_list() -> Result<(), Error> { { - let coins = RawCoin::from_string_list("123stake,1a1,999den0m")?; + let coins = RawCoin::from_string_list("123stake,1ab1,999de-n0m")?; assert_eq!(coins.len(), 3); assert_eq!(coins[0].denom, "stake"); assert_eq!(coins[0].amount, 123u64.into()); - assert_eq!(coins[1].denom, "a1"); + assert_eq!(coins[1].denom, "ab1"); assert_eq!(coins[1].amount, 1u64.into()); - assert_eq!(coins[2].denom, "den0m"); + assert_eq!(coins[2].denom, "de-n0m"); assert_eq!(coins[2].amount, 999u64.into()); } diff --git a/crates/relayer-types/src/applications/transfer/error.rs b/crates/relayer-types/src/applications/transfer/error.rs index ba4f26aa31..5fdf2660aa 100644 --- a/crates/relayer-types/src/applications/transfer/error.rs +++ b/crates/relayer-types/src/applications/transfer/error.rs @@ -135,7 +135,7 @@ define_error! { InvalidCoin { coin: String } - | e | { format_args!("invalid coin string: {}", e.coin) }, + | e | { format_args!("invalid coin: {}", e.coin) }, Utf8Decode [ TraceError ] diff --git a/crates/relayer-types/src/core/ics24_host/identifier.rs b/crates/relayer-types/src/core/ics24_host/identifier.rs index 15713ec044..0405c50b2d 100644 --- a/crates/relayer-types/src/core/ics24_host/identifier.rs +++ b/crates/relayer-types/src/core/ics24_host/identifier.rs @@ -2,12 +2,14 @@ use std::convert::{From, Infallible}; use std::fmt::{Debug, Display, Error as FmtError, Formatter}; use std::str::FromStr; +use regex::Regex; use serde::{Deserialize, Serialize}; -use super::validate::*; use crate::core::ics02_client::client_type::ClientType; use crate::core::ics24_host::error::ValidationError; +use super::validate::*; + /// This type is subject to future changes. /// /// TODO: ChainId validation is not standardized yet. @@ -101,8 +103,8 @@ impl ChainId { /// assert_eq!(ChainId::is_epoch_format("chainA-1"), true); /// ``` pub fn is_epoch_format(chain_id: &str) -> bool { - let re = safe_regex::regex!(br".+[^-]-{1}[1-9][0-9]*"); - re.is_match(chain_id.as_bytes()) + let re = Regex::new(r"^.+[^-]-{1}[1-9][0-9]*$").expect("failed to compile regex"); + re.is_match(chain_id) } } diff --git a/crates/relayer-types/src/timestamp.rs b/crates/relayer-types/src/timestamp.rs index b9bf462a2a..0b137368ff 100644 --- a/crates/relayer-types/src/timestamp.rs +++ b/crates/relayer-types/src/timestamp.rs @@ -64,7 +64,7 @@ impl Timestamp { } /// Returns a `Timestamp` representation of the current time. - #[cfg(feature = "clock")] + #[cfg(any(test, feature = "clock"))] pub fn now() -> Timestamp { Time::now().into() } diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index 8aff2745c7..ee92d095e2 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -56,7 +56,7 @@ signature = "2.1.0" anyhow = "1.0" semver = "1.0" humantime = "2.1.0" -regex = "1.8.1" +regex = "1" moka = "0.11.3" uuid = { version = "1.4.0", features = ["v4"] } bs58 = "0.5.0" diff --git a/tools/check-guide/Cargo.lock b/tools/check-guide/Cargo.lock index 307ef5a3c0..514dd7bf6c 100644 --- a/tools/check-guide/Cargo.lock +++ b/tools/check-guide/Cargo.lock @@ -774,7 +774,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -800,17 +800,32 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if 1.0.0", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms", + "rustc_version", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.25", +] + [[package]] name = "curve25519-dalek-ng" version = "4.1.1" @@ -819,7 +834,7 @@ checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest 0.9.0", - "rand_core 0.6.4", + "rand_core", "subtle-ng", "zeroize", ] @@ -934,28 +949,19 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature 2.1.0", + "signature", "spki", ] [[package]] name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "serde", - "signature 1.6.4", -] - -[[package]] -name = "ed25519" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "pkcs8", - "signature 2.1.0", + "serde", + "signature", ] [[package]] @@ -966,31 +972,30 @@ checksum = "3c8465edc8ee7436ffea81d21a019b16676ee3db267aa8d5a8d729581ecf998b" dependencies = [ "curve25519-dalek-ng", "hex", - "rand_core 0.6.4", + "rand_core", "sha2 0.9.9", "zeroize", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ "curve25519-dalek", - "ed25519 1.5.3", - "rand 0.7.3", + "ed25519", + "rand_core", "serde", - "serde_bytes", - "sha2 0.9.9", + "sha2 0.10.7", "zeroize", ] [[package]] name = "ed25519-dalek-bip32" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908" +checksum = "6b49a684b133c4980d7ee783936af771516011c8cd15f429dbda77245e282f03" dependencies = [ "derivation-path", "ed25519-dalek", @@ -1029,7 +1034,7 @@ dependencies = [ "generic-array", "group", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "subtle", "zeroize", @@ -1156,10 +1161,16 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" + [[package]] name = "filetime" version = "0.2.21" @@ -1332,17 +1343,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.10" @@ -1352,7 +1352,7 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -1388,7 +1388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -1763,7 +1763,7 @@ dependencies = [ "crossbeam-channel 0.5.8", "digest 0.10.7", "dirs-next", - "ed25519 1.5.3", + "ed25519", "ed25519-dalek", "ed25519-dalek-bip32", "flex-error", @@ -1792,7 +1792,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.7", - "signature 1.6.4", + "signature", "strum", "subtle-encoding", "tendermint", @@ -1877,7 +1877,7 @@ dependencies = [ "num-rational", "primitive-types", "prost", - "safe-regex", + "regex", "serde", "serde_derive", "serde_json", @@ -1911,14 +1911,14 @@ dependencies = [ [[package]] name = "ics23" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af9e8f569c5cc88e08b8d076dc207e0748aa1f52d4b84910ec919c8f2bed6ea7" +checksum = "442d4bab37956e76f739c864f246c825d87c0bb7f9afa65660c57833c91bf6d4" dependencies = [ "anyhow", "bytes", "hex", - "pbjson", + "informalsystems-pbjson", "prost", "ripemd", "serde", @@ -1994,6 +1994,16 @@ dependencies = [ "hashbrown 0.14.0", ] +[[package]] +name = "informalsystems-pbjson" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eecd90f87bea412eac91c6ef94f6b1e390128290898cbe14f2b926787ae1fb" +dependencies = [ + "base64 0.13.1", + "serde", +] + [[package]] name = "inotify" version = "0.9.6" @@ -2311,7 +2321,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -2545,7 +2555,7 @@ dependencies = [ "once_cell", "opentelemetry_api", "percent-encoding", - "rand 0.8.5", + "rand", "thiserror", ] @@ -2596,16 +2606,6 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" -[[package]] -name = "pbjson" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048f9ac93c1eab514f9470c4bc8d97ca2a0a236b84f45cc19d69a59fc11467f6" -dependencies = [ - "base64 0.13.1", - "serde", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -2718,7 +2718,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared", - "rand 0.8.5", + "rand", ] [[package]] @@ -2772,6 +2772,12 @@ dependencies = [ "spki", ] +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2903,7 +2909,7 @@ dependencies = [ "mach2", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] @@ -2917,19 +2923,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -2937,18 +2930,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -2958,16 +2941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -2976,16 +2950,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -3021,7 +2986,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] @@ -3289,53 +3254,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" -[[package]] -name = "safe-proc-macro2" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "814c536dcd27acf03296c618dab7ad62d28e70abd7ba41d3f34a2ce707a2c666" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "safe-quote" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e530f7831f3feafcd5f1aae406ac205dd998436b4007c8e80f03eca78a88f7" -dependencies = [ - "safe-proc-macro2", -] - -[[package]] -name = "safe-regex" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15289bf322e0673d52756a18194167f2378ec1a15fe884af6e2d2cb934822b0" -dependencies = [ - "safe-regex-macro", -] - -[[package]] -name = "safe-regex-compiler" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba76fae590a2aa665279deb1f57b5098cbace01a0c5e60e262fcf55f7c51542" -dependencies = [ - "safe-proc-macro2", - "safe-quote", -] - -[[package]] -name = "safe-regex-macro" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c2e96b5c03f158d1b16ba79af515137795f4ad4e8de3f790518aae91f1d127" -dependencies = [ - "safe-proc-macro2", - "safe-regex-compiler", -] - [[package]] name = "same-file" version = "1.0.6" @@ -3416,7 +3334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" dependencies = [ "bitcoin_hashes", - "rand 0.8.5", + "rand", "secp256k1-sys", "serde", ] @@ -3649,12 +3567,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - [[package]] name = "signature" version = "2.1.0" @@ -3662,7 +3574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -3882,7 +3794,7 @@ checksum = "f6d550db02d6bec4ebcbbebc4301ec22181bc489c37fb3f167e64b14c1be8321" dependencies = [ "bytes", "digest 0.10.7", - "ed25519 2.2.1", + "ed25519", "ed25519-consensus", "flex-error", "futures", @@ -3897,7 +3809,7 @@ dependencies = [ "serde_json", "serde_repr", "sha2 0.10.7", - "signature 2.1.0", + "signature", "subtle", "subtle-encoding", "tendermint-proto", @@ -4010,7 +3922,7 @@ dependencies = [ "bytes", "flex-error", "futures", - "getrandom 0.2.10", + "getrandom", "http", "hyper", "hyper-proxy", @@ -4153,7 +4065,7 @@ dependencies = [ "hmac", "once_cell", "pbkdf2", - "rand 0.8.5", + "rand", "rustc-hash", "sha2 0.10.7", "thiserror", @@ -4388,7 +4300,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", + "rand", "slab", "tokio", "tokio-util", @@ -4519,7 +4431,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.5", + "rand", "rustls 0.20.8", "sha1", "thiserror", @@ -4647,7 +4559,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -4720,12 +4632,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1"