diff --git a/lib/Cargo.lock b/lib/Cargo.lock index 43163dd0ad..ee74c62273 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -185,7 +185,7 @@ dependencies = [ "ain-ocean", "anyhow", "async-trait", - "axum 0.7.5", + "axum", "cxx", "defichain-rpc", "env_logger", @@ -205,7 +205,7 @@ dependencies = [ "parking_lot", "prettyplease 0.2.22", "proc-macro2", - "prost", + "prost 0.11.9", "prost-build", "quote", "rand 0.8.5", @@ -241,7 +241,7 @@ dependencies = [ "ain-db", "ain-dftx", "ain-macros", - "axum 0.7.5", + "axum", "bincode", "bitcoin", "cached", @@ -270,30 +270,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "ain-rs-exports" -version = "0.1.0" -dependencies = [ - "ain-contracts", - "ain-cpp-imports", - "ain-evm", - "ain-grpc", - "ain-macros", - "ain-ocean", - "anyhow", - "cxx", - "cxx-gen", - "defichain-rpc", - "ethabi", - "ethereum", - "ethereum-types", - "hex", - "log", - "proc-macro2", - "rlp", - "serde_json", -] - [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -394,6 +370,28 @@ dependencies = [ "zstd-safe 7.2.1", ] +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "async-trait" version = "0.1.82" @@ -405,6 +403,12 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "atty" version = "0.2.14" @@ -433,34 +437,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core 0.3.4", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper 0.1.2", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.7.5" @@ -468,7 +444,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", - "axum-core 0.4.3", + "axum-core", "axum-macros", "bytes", "futures-util", @@ -496,23 +472,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.4.3" @@ -1305,18 +1264,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "cxx-gen" -version = "0.7.128" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f32748b8c1492522ff281e093ed9133e361bfdda3ed5b164e3bb223cabc0e7" -dependencies = [ - "codespan-reporting", - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "cxxbridge-flags" version = "1.0.128" @@ -2215,6 +2162,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hash-db" version = "0.15.2" @@ -2469,7 +2435,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2492,6 +2458,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -2500,6 +2467,7 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", + "want", ] [[package]] @@ -2521,14 +2489,15 @@ dependencies = [ [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ - "hyper 0.14.30", + "hyper 1.4.1", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] @@ -2538,12 +2507,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", + "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", "hyper 1.4.1", "pin-project-lite", + "socket2", "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2983,7 +2957,7 @@ dependencies = [ "lazy_static", "log", "num-traits", - "prost", + "prost 0.11.9", "prost-build", "rand 0.8.5", "serde", @@ -3913,6 +3887,15 @@ dependencies = [ "prost-derive", ] +[[package]] +name = "prost" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +dependencies = [ + "bytes", +] + [[package]] name = "prost-build" version = "0.11.9" @@ -3927,7 +3910,7 @@ dependencies = [ "multimap", "petgraph", "prettyplease 0.1.25", - "prost", + "prost 0.11.9", "prost-types", "regex", "syn 1.0.109", @@ -3954,7 +3937,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", ] [[package]] @@ -4205,7 +4188,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.30", @@ -5688,16 +5671,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -5774,24 +5747,26 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ + "async-stream", "async-trait", - "axum 0.6.20", - "base64 0.21.7", + "axum", + "base64 0.22.1", "bytes", - "futures-core", - "futures-util", - "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", - "prost", + "prost 0.13.3", + "socket2", "tokio", "tokio-stream", "tower", diff --git a/lib/Cargo.toml b/lib/Cargo.toml index fa5ac84673..471e792a14 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -47,7 +47,7 @@ proc-macro2 = "1.0" cxx = "1.0" cxx-build = "1.0" cxx-gen = "0.7" -tonic = "0.9" +tonic = "0.12" tonic-build = "0.9" prost = "0.11" prost-build = "0.11" diff --git a/lib/labs-grpc2/Cargo.toml b/lib/labs-grpc2/Cargo.toml index bc8fd032b9..6ed714f9d5 100644 --- a/lib/labs-grpc2/Cargo.toml +++ b/lib/labs-grpc2/Cargo.toml @@ -13,7 +13,7 @@ num-traits = "0.2" prost = "0.11" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -tonic = "0.9" +tonic = "0.12" fake = "2.5" rand = "0.8" anyhow = "1.0.70" @@ -23,7 +23,7 @@ async-trait = "0.1.68" prost-build = "0.11" tonic-build = "0.9" anyhow = "1.0.70" -tonic = "0.9" +tonic = "0.12" [dev-dependencies] erased-serde = "0.3.25"