diff --git a/Cargo.lock b/Cargo.lock index 0fa05779d2..4aa78cadaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -310,6 +310,49 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +[[package]] +name = "axum" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4af7447fc1214c1f3a1ace861d0216a6c8bb13965b64bbad9650f375b67689a" +dependencies = [ + "async-trait", + "axum-core", + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa 1.0.1", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde", + "sync_wrapper", + "tokio", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da31c0ed7b4690e2c78fe4b880d21cd7db04a346ebc658b4270251b695437f17" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", +] + [[package]] name = "backtrace" version = "0.3.64" @@ -953,7 +996,7 @@ dependencies = [ "criterion-plot", "csv", "futures", - "itertools 0.10.3", + "itertools", "lazy_static", "num-traits", "oorandom", @@ -976,7 +1019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" dependencies = [ "cast", - "itertools 0.10.3", + "itertools", ] [[package]] @@ -1514,8 +1557,8 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util", - "tonic 0.4.3", + "tokio-util 0.6.9", + "tonic 0.7.2", "tracing", "tracing-appender", "tracing-futures", @@ -1932,7 +1975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8bc64bdceb2909623131a62d470e809c32f86b8329d82f8d31d9971349cb00a" dependencies = [ "gtmpl_value", - "itertools 0.10.3", + "itertools", "lazy_static", "percent-encoding", ] @@ -1958,7 +2001,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] @@ -2104,9 +2147,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" dependencies = [ "bytes", "fnv", @@ -2124,6 +2167,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "http-zipkin" version = "0.3.0" @@ -2332,15 +2381,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.3" @@ -2458,8 +2498,8 @@ dependencies = [ "time", "tokio", "tokio-stream", - "tokio-util", - "tonic 0.6.2", + "tokio-util 0.6.9", + "tonic 0.7.2", "tracing", "tracing-appender", "tracing-futures", @@ -2523,7 +2563,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tonic 0.6.2", + "tonic 0.7.2", "tonic-build", "tracing", "tracing-subscriber", @@ -2578,7 +2618,7 @@ dependencies = [ "thiserror", "thor", "tokio", - "tonic 0.6.2", + "tonic 0.7.2", "tracing", "url", "yaml-rust", @@ -2914,6 +2954,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +[[package]] +name = "matchit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" + [[package]] name = "memchr" version = "2.4.1" @@ -3620,7 +3666,7 @@ checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" dependencies = [ "difflib", "float-cmp", - "itertools 0.10.3", + "itertools", "normalize-line-endings", "predicates-core", "regex", @@ -3766,22 +3812,22 @@ dependencies = [ [[package]] name = "prost" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "prost-derive 0.7.0", + "prost-derive 0.9.0", ] [[package]] name = "prost" -version = "0.9.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +checksum = "bc03e116981ff7d8da8e5c220e374587b98d294af7ba7dd7fda761158f00086f" dependencies = [ "bytes", - "prost-derive 0.9.0", + "prost-derive 0.10.1", ] [[package]] @@ -3792,7 +3838,7 @@ checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck", - "itertools 0.10.3", + "itertools", "lazy_static", "log", "multimap", @@ -3806,12 +3852,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", - "itertools 0.9.0", + "itertools", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -3819,12 +3865,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", - "itertools 0.10.3", + "itertools", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -4379,9 +4425,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "itoa 1.0.1", "ryu", @@ -4713,6 +4759,12 @@ dependencies = [ "unicode-xid 0.2.2", ] +[[package]] +name = "sync_wrapper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" + [[package]] name = "synstructure" version = "0.12.6" @@ -5024,7 +5076,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.6.9", ] [[package]] @@ -5055,6 +5107,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" version = "0.5.8" @@ -5066,9 +5132,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.4.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac42cd97ac6bd2339af5bcabf105540e21e45636ec6fa6aae5e85d44db31be0" +checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" dependencies = [ "async-stream", "async-trait", @@ -5080,14 +5146,16 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.7.0", - "prost-derive 0.7.0", + "prost 0.9.0", + "prost-derive 0.9.0", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tower", + "tower-layer", "tower-service", "tracing", "tracing-futures", @@ -5095,12 +5163,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" +checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb" dependencies = [ "async-stream", "async-trait", + "axum", "base64", "bytes", "futures-core", @@ -5112,11 +5181,11 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.9.0", - "prost-derive 0.9.0", + "prost 0.10.3", + "prost-derive 0.10.1", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.7.1", "tower", "tower-layer", "tower-service", @@ -5151,12 +5220,31 @@ dependencies = [ "slab", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tower-layer", "tower-service", "tracing", ] +[[package]] +name = "tower-http" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e980386f06883cf4d0578d6c9178c81f68b45d77d00f2c2c1bc034b3439c2c56" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.1" @@ -5237,7 +5325,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing-core", "tracing-futures", "tracing-subscriber", @@ -5563,7 +5651,7 @@ dependencies = [ "tokio-rustls 0.22.0", "tokio-stream", "tokio-tungstenite", - "tokio-util", + "tokio-util 0.6.9", "tower-service", "tracing", ] diff --git a/explorer/Cargo.toml b/explorer/Cargo.toml index 92f0e4887f..706c779793 100644 --- a/explorer/Cargo.toml +++ b/explorer/Cargo.toml @@ -16,7 +16,7 @@ futures-util = "0.3.5" async-graphql = "3" async-graphql-warp = "3" serde = {version = "1.0.114", features = ["derive"]} -serde_json = "1.0.56" +serde_json = "1.0.81" serde_yaml = "0.8.13" structopt = "0.3.15" thiserror = "1.0.20" @@ -31,7 +31,7 @@ tracing-appender = "0.2" tokio = { version = "^1.4", features = ["rt-multi-thread", "time", "sync", "rt", "signal", "test-util"] } tokio-stream = { version = "0.1.4", features = ["sync"] } tokio-util = { version = "0.6.0", features = ["time"] } -tonic = "0.4" +tonic = "0.7" multiaddr = { package = "parity-multiaddr", version = "0.11" } rand = "0.8.5" rand_chacha = "0.3.0" diff --git a/jormungandr/Cargo.toml b/jormungandr/Cargo.toml index d1bcf695a4..b5ff44882a 100644 --- a/jormungandr/Cargo.toml +++ b/jormungandr/Cargo.toml @@ -40,7 +40,7 @@ rand = "0.8" rand_chacha = "0.3" serde = "1.0" serde_derive = "1.0" -serde_json = "1.0.74" +serde_json = "1.0.81" serde_yaml = "0.8" structopt = "^0.3" time = { version = "0.3", features = ["macros"] } @@ -55,7 +55,7 @@ tracing-appender = "0.2" tokio = { version = "^1.15", features = ["rt-multi-thread", "time", "sync", "rt", "signal", "test-util"] } tokio-stream = { version = "0.1.4", features = ["sync"] } tokio-util = { version = "0.6.0", features = ["time"] } -tonic = "0.6" +tonic = "0.7" lru = "0.7" warp = { version = "0.3.2", features = ["tls"] } serde_with = { version = "1.12", features = ["macros"] } diff --git a/testing/jormungandr-automation/Cargo.toml b/testing/jormungandr-automation/Cargo.toml index efb357057a..c92ebc695b 100644 --- a/testing/jormungandr-automation/Cargo.toml +++ b/testing/jormungandr-automation/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tonic = "0.6" +tonic = "0.7" prost = "0.9" tokio = { version = "1.15", features = ["macros","rt","rt-multi-thread"] } tokio-stream = "0.1" diff --git a/testing/jormungandr-integration-tests/Cargo.toml b/testing/jormungandr-integration-tests/Cargo.toml index a46308413a..9f7336e262 100644 --- a/testing/jormungandr-integration-tests/Cargo.toml +++ b/testing/jormungandr-integration-tests/Cargo.toml @@ -5,7 +5,7 @@ authors = [ "dev@iohk.io" ] edition = "2021" [dependencies] -tonic = "0.6" +tonic = "0.7" bech32 = "0.7" prost = "0.9" tokio = { version = "1.15", features = ["macros", "time"] }