From b20d9b75cb3309fad3e26f54bd6c6fdabb409e08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:52:18 +0000 Subject: [PATCH] Bump tide-disco from v0.4.6 to v0.5.0 Bumps [tide-disco](https://github.com/EspressoSystems/tide-disco) from v0.4.6 to v0.5.0. - [Release notes](https://github.com/EspressoSystems/tide-disco/releases) - [Commits](https://github.com/EspressoSystems/tide-disco/compare/4ced31cef8aae769994098d245e026c127801b74...07e489171089650cebfaca9ca6a6a6ddd843610d) --- updated-dependencies: - dependency-name: tide-disco dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 294 ++++++++++++++++++++++++++++++++++++++++++++++------- Cargo.toml | 2 +- 2 files changed, 256 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a96a954..7a921af2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1055,6 +1055,9 @@ name = "bitflags" version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] [[package]] name = "bitvec" @@ -1369,14 +1372,34 @@ dependencies = [ "lazy_static", "nom", "pathdiff", - "ron", - "rust-ini", + "ron 0.7.1", + "rust-ini 0.18.0", "serde", "serde_json", "toml 0.5.11", "yaml-rust", ] +[[package]] +name = "config" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +dependencies = [ + "async-trait", + "convert_case 0.6.0", + "json5", + "lazy_static", + "nom", + "pathdiff", + "ron 0.8.1", + "rust-ini 0.19.0", + "serde", + "serde_json", + "toml 0.8.10", + "yaml-rust", +] + [[package]] name = "console-api" version = "0.5.0" @@ -1419,6 +1442,26 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.12", + "once_cell", + "tiny-keccak", +] + [[package]] name = "const_fn" version = "0.4.9" @@ -1437,6 +1480,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cookie" version = "0.14.4" @@ -1902,7 +1954,7 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version 0.4.0", @@ -1973,6 +2025,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -2774,7 +2835,7 @@ dependencies = [ "portpicker", "rand 0.8.5", "serde", - "snafu", + "snafu 0.7.5", "surf-disco", "time 0.3.34", "tokio", @@ -2815,7 +2876,7 @@ dependencies = [ "serde", "sha2 0.10.8", "sha3", - "snafu", + "snafu 0.7.5", "tokio", "tracing", ] @@ -2838,7 +2899,7 @@ dependencies = [ "serde_json", "surf-disco", "thiserror", - "tide-disco", + "tide-disco 0.4.6", "tokio", "toml 0.8.10", "tracing", @@ -2879,7 +2940,7 @@ dependencies = [ "hotshot-utils", "jf-primitives", "sha2 0.10.8", - "snafu", + "snafu 0.7.5", "time 0.3.34", "tokio", "tracing", @@ -2924,7 +2985,7 @@ dependencies = [ "rand_chacha 0.3.1", "serde", "sha2 0.10.8", - "snafu", + "snafu 0.7.5", "tagged-base64", "time 0.3.34", "tokio", @@ -2953,7 +3014,7 @@ dependencies = [ "futures", "hotshot-types", "rand 0.8.5", - "tide-disco", + "tide-disco 0.4.6", "tokio", "toml 0.8.10", "tracing", @@ -2970,9 +3031,9 @@ dependencies = [ "futures", "hotshot-types", "serde", - "snafu", + "snafu 0.7.5", "tagged-base64", - "tide-disco", + "tide-disco 0.4.6", "toml 0.8.10", ] @@ -2995,7 +3056,7 @@ dependencies = [ "serde", "sha2 0.10.8", "tagged-base64", - "tide-disco", + "tide-disco 0.5.0", "tracing", ] @@ -3133,7 +3194,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core", ] [[package]] @@ -3930,7 +3991,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "snafu", + "snafu 0.7.5", "tokio", "tokio-stream", "tracing", @@ -4407,7 +4468,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0bab19cef8a7fe1c18a43e881793bfc9d4ea984befec3ae5bd0415abf3ecf00" dependencies = [ "itoa", - "maud_macros", + "maud_macros 0.25.0", + "tide", +] + +[[package]] +name = "maud" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df518b75016b4289cdddffa1b01f2122f4a49802c93191f3133f6dc2472ebcaa" +dependencies = [ + "itoa", + "maud_macros 0.26.0", "tide", ] @@ -4423,6 +4495,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "maud_macros" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa453238ec218da0af6b11fc5978d3b5c3a45ed97b722391a2a11f3306274e18" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "memchr" version = "2.7.1" @@ -4811,10 +4895,20 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ - "dlv-list", + "dlv-list 0.3.0", "hashbrown 0.12.3", ] +[[package]] +name = "ordered-multimap" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +dependencies = [ + "dlv-list 0.5.2", + "hashbrown 0.13.2", +] + [[package]] name = "overload" version = "0.1.1" @@ -5588,6 +5682,18 @@ dependencies = [ "serde", ] +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.7", + "bitflags 2.4.2", + "serde", + "serde_derive", +] + [[package]] name = "route-recognizer" version = "0.2.0" @@ -5627,7 +5733,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" dependencies = [ "cfg-if", - "ordered-multimap", + "ordered-multimap 0.4.3", +] + +[[package]] +name = "rust-ini" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +dependencies = [ + "cfg-if", + "ordered-multimap 0.6.0", ] [[package]] @@ -5933,9 +6049,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.6.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ "base64 0.21.7", "chrono", @@ -5951,9 +6067,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.6.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling 0.20.8", "proc-macro2", @@ -6162,7 +6278,16 @@ checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" dependencies = [ "backtrace", "doc-comment", - "snafu-derive", + "snafu-derive 0.7.5", +] + +[[package]] +name = "snafu" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +dependencies = [ + "snafu-derive 0.8.2", ] [[package]] @@ -6177,6 +6302,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "snafu-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "snow" version = "0.9.6" @@ -6345,6 +6482,12 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" + [[package]] name = "strum_macros" version = "0.25.3" @@ -6358,6 +6501,19 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.52", +] + [[package]] name = "subtle" version = "2.5.0" @@ -6401,7 +6557,7 @@ dependencies = [ "serde", "serde_json", "surf", - "tide-disco", + "tide-disco 0.4.6", ] [[package]] @@ -6553,7 +6709,7 @@ dependencies = [ "base64 0.21.7", "crc-any", "serde", - "snafu", + "snafu 0.7.5", "tagged-base64-macros", "wasm-bindgen", ] @@ -6654,7 +6810,57 @@ dependencies = [ "async-trait", "bincode", "clap", - "config", + "config 0.13.4", + "derivative", + "derive_more", + "dirs", + "edit-distance", + "futures", + "futures-util", + "http 1.0.0", + "include_dir", + "lazy_static", + "libc", + "markdown", + "maud 0.25.0", + "num-derive", + "num-traits", + "parking_lot", + "prometheus", + "routefinder", + "semver 1.0.22", + "serde", + "serde_json", + "serde_with", + "shellexpand", + "signal-hook", + "signal-hook-async-std", + "snafu 0.7.5", + "strum 0.25.0", + "strum_macros 0.25.3", + "surf", + "tagged-base64", + "tide", + "tide-websockets", + "toml 0.8.10", + "tracing", + "tracing-distributed", + "tracing-futures", + "tracing-log", + "tracing-subscriber", + "url", +] + +[[package]] +name = "tide-disco" +version = "0.5.0" +source = "git+https://github.com/EspressoSystems/tide-disco?tag=v0.5.0#07e489171089650cebfaca9ca6a6a6ddd843610d" +dependencies = [ + "anyhow", + "async-std", + "async-trait", + "clap", + "config 0.14.0", "derivative", "derive_more", "dirs", @@ -6666,7 +6872,7 @@ dependencies = [ "lazy_static", "libc", "markdown", - "maud", + "maud 0.26.0", "num-derive", "num-traits", "parking_lot", @@ -6679,9 +6885,9 @@ dependencies = [ "shellexpand", "signal-hook", "signal-hook-async-std", - "snafu", - "strum", - "strum_macros", + "snafu 0.8.2", + "strum 0.26.2", + "strum_macros 0.26.2", "surf", "tagged-base64", "tide", @@ -6693,6 +6899,7 @@ dependencies = [ "tracing-log", "tracing-subscriber", "url", + "versioned-binary-serialization", ] [[package]] @@ -7193,6 +7400,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + [[package]] name = "unicode-xid" version = "0.2.4" @@ -7325,6 +7538,18 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "versioned-binary-serialization" +version = "0.1.2" +source = "git+https://github.com/EspressoSystems/versioned-binary-serialization.git?tag=0.1.2#6874f91a3c8d64acc24fe0abe4ad93c35b75eb9d" +dependencies = [ + "anyhow", + "bincode", + "displaydoc", + "serde", + "serde_with", +] + [[package]] name = "void" version = "1.0.2" @@ -7495,7 +7720,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core 0.51.1", + "windows-core", "windows-targets 0.48.5", ] @@ -7508,15 +7733,6 @@ 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 = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index e8663f05..1deddd85 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,6 @@ hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = hs-builder-api = { git = "https://github.com/EspressoSystems/hs-builder-api", branch = "main" } sha2 = "0.10" serde = { version = "1.0", features = ["derive"] } -tide-disco = { git = "https://github.com/EspressoSystems/tide-disco", tag = "v0.4.6" } +tide-disco = { git = "https://github.com/EspressoSystems/tide-disco", tag = "v0.5.0" } tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64", tag = "0.3.4" } tracing = "0.1"