From f9e280bdd2a5570bdc8bd7f57b513c7fc172adcb Mon Sep 17 00:00:00 2001 From: ackintosh Date: Thu, 5 Jan 2023 00:06:28 +0900 Subject: [PATCH 01/10] censoring: Update libp2p to the latest revision --- censoring/Cargo.lock | 2187 +++++++++++++++++++++++++++++-------- censoring/Cargo.toml | 16 +- censoring/Dockerfile | 2 +- censoring/src/attacker.rs | 24 +- censoring/src/honest.rs | 23 +- censoring/src/utils.rs | 12 +- 6 files changed, 1763 insertions(+), 501 deletions(-) diff --git a/censoring/Cargo.lock b/censoring/Cargo.lock index 9d43d7f..2d5f9f1 100644 --- a/censoring/Cargo.lock +++ b/censoring/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array", +] + [[package]] name = "aead" version = "0.4.3" @@ -9,6 +18,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array", + "rand_core 0.6.4", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher 0.2.5", ] [[package]] @@ -18,25 +39,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug", ] +[[package]] +name = "aes-gcm" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +dependencies = [ + "aead 0.3.2", + "aes 0.6.0", + "cipher 0.2.5", + "ctr 0.6.0", + "ghash 0.3.1", + "subtle", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", + "aead 0.4.3", + "aes 0.7.5", + "cipher 0.3.0", + "ctr 0.8.0", + "ghash 0.4.4", "subtle", ] +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -57,9 +112,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "arc-swap" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "arrayref" @@ -74,51 +135,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "asn1_der" -version = "0.7.5" +name = "asn1-rs" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive 0.1.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] [[package]] -name = "async-channel" -version = "1.8.0" +name = "asn1-rs" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", ] [[package]] -name = "async-executor" -version = "1.5.0" +name = "asn1-rs-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", + "proc-macro2", + "quote", + "syn", + "synstructure", ] [[package]] -name = "async-global-executor" -version = "2.3.1" +name = "asn1-rs-derive" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] +[[package]] +name = "asn1_der" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" + [[package]] name = "async-io" version = "1.12.0" @@ -149,17 +237,11 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" dependencies = [ "proc-macro2", "quote", @@ -191,12 +273,45 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -205,9 +320,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ "digest 0.10.6", ] @@ -231,19 +346,21 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.3.0" +name = "block-modes" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", + "block-padding", + "cipher 0.2.5", ] +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + [[package]] name = "bs58" version = "0.4.0" @@ -273,9 +390,20 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.77" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "ccm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" +dependencies = [ + "aead 0.3.2", + "cipher 0.2.5", + "subtle", +] [[package]] name = "censoring" @@ -283,10 +411,10 @@ version = "0.1.0" dependencies = [ "chrono", "delay_map", - "libp2p 0.47.0", - "libp2p 0.49.0", - "prometheus-client 0.19.0", - "prost 0.11.3", + "libp2p 0.51.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p 0.51.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "prometheus-client", + "prost", "rand 0.8.5", "serde", "serde_json", @@ -309,7 +437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "zeroize", ] @@ -320,9 +448,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead", + "aead 0.4.3", "chacha20", - "cipher", + "cipher 0.3.0", "poly1305", "zeroize", ] @@ -340,6 +468,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] + [[package]] name = "cipher" version = "0.3.0" @@ -369,7 +506,7 @@ version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro-error", "proc-macro2", "quote", @@ -404,6 +541,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-oid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" + [[package]] name = "core-foundation" version = "0.9.3" @@ -438,6 +581,27 @@ dependencies = [ "libc", ] +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + +[[package]] +name = "crc" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" + [[package]] name = "crossbeam-utils" version = "0.8.14" @@ -453,6 +617,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -463,20 +639,49 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "ctr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +dependencies = [ + "cipher 0.2.5", +] + [[package]] name = "ctr" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", ] [[package]] name = "curve25519-dalek" -version = "3.2.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", @@ -487,22 +692,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.2" +version = "4.0.0-pre.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc3116fe595d7847c701796ac1b189bd86b81f4f593c6f775f9d80fb2e29f4" +checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f" dependencies = [ - "byteorder", - "digest 0.10.6", - "rand_core 0.6.4", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms", "subtle", "zeroize", ] [[package]] name = "cxx" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" dependencies = [ "cc", "cxxbridge-flags", @@ -512,9 +718,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" +checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" dependencies = [ "cc", "codespan-reporting", @@ -527,15 +733,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" +checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" [[package]] name = "cxxbridge-macro" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" +checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" dependencies = [ "proc-macro2", "quote", @@ -579,9 +785,29 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" + +[[package]] +name = "data-encoding-macro" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" +dependencies = [ + "data-encoding", + "data-encoding-macro-internal", +] + +[[package]] +name = "data-encoding-macro-internal" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" +dependencies = [ + "data-encoding", + "syn", +] [[package]] name = "delay_map" @@ -593,6 +819,76 @@ dependencies = [ "tokio-util 0.6.10", ] +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs 0.3.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "8.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +dependencies = [ + "asn1-rs 0.5.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn", +] + [[package]] name = "digest" version = "0.9.0" @@ -613,11 +909,34 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dtoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" + +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] [[package]] name = "ed25519" @@ -634,7 +953,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.2.1", + "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", "serde", @@ -648,6 +967,28 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +[[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "digest 0.10.6", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "encoding_rs" version = "0.8.31" @@ -659,11 +1000,11 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro2", "quote", "syn", @@ -684,6 +1025,22 @@ dependencies = [ "instant", ] +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -780,6 +1137,17 @@ dependencies = [ "syn", ] +[[package]] +name = "futures-rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" +dependencies = [ + "futures-io", + "rustls 0.20.7", + "webpki 0.22.0", +] + [[package]] name = "futures-sink" version = "0.3.25" @@ -848,6 +1216,16 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +dependencies = [ + "opaque-debug", + "polyval 0.4.5", +] + [[package]] name = "ghash" version = "0.4.4" @@ -855,7 +1233,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug", - "polyval", + "polyval 0.5.3", +] + +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", ] [[package]] @@ -883,15 +1272,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.0" @@ -900,9 +1280,9 @@ checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] @@ -919,6 +1299,44 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac 0.11.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "hostname" version = "0.3.1" @@ -1051,9 +1469,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd" +checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" dependencies = [ "async-io", "core-foundation", @@ -1064,6 +1482,7 @@ dependencies = [ "log", "rtnetlink", "system-configuration", + "tokio", "windows", ] @@ -1115,6 +1534,25 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "interceptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" +dependencies = [ + "async-trait", + "bytes", + "log", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] + [[package]] name = "ipconfig" version = "0.3.1" @@ -1129,9 +1567,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" [[package]] name = "ipnetwork" @@ -1153,9 +1591,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" @@ -1174,72 +1612,78 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libm" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libp2p" -version = "0.47.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.51.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "lazy_static", - "libp2p-core 0.35.1", - "libp2p-dns 0.35.0", - "libp2p-gossipsub 0.40.0", - "libp2p-kad 0.39.0", - "libp2p-metrics 0.8.0", - "libp2p-mplex 0.35.0", - "libp2p-noise 0.38.0", - "libp2p-swarm 0.38.0", - "libp2p-swarm-derive 0.29.0", - "libp2p-tcp 0.35.0", - "libp2p-yamux 0.39.0", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-dns 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-kad 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-mdns 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-metrics 0.12.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-mplex 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-noise 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-quic 0.7.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-tcp 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-webrtc 0.4.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-yamux 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "multiaddr", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p" -version = "0.49.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.51.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "lazy_static", - "libp2p-core 0.36.0", - "libp2p-dns 0.36.0", - "libp2p-gossipsub 0.41.0", - "libp2p-kad 0.41.0", - "libp2p-metrics 0.10.0", - "libp2p-mplex 0.36.0", - "libp2p-noise 0.39.1", - "libp2p-swarm 0.39.0", - "libp2p-swarm-derive 0.30.1", - "libp2p-tcp 0.37.0", - "libp2p-yamux 0.40.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-dns 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-kad 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-mdns 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-metrics 0.12.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-mplex 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-noise 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-quic 0.7.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-tcp 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-webrtc 0.4.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-yamux 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "multiaddr", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p-core" -version = "0.35.1" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "asn1_der", "bs58", @@ -1249,18 +1693,18 @@ dependencies = [ "futures", "futures-timer", "instant", - "lazy_static", "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=testground)", + "multistream-select 0.12.1 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "once_cell", "parking_lot 0.12.1", "pin-project", - "prost 0.11.3", - "prost-build 0.11.3", + "prost", + "prost-build", "rand 0.8.5", - "ring", - "rw-stream-sink 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=testground)", + "rw-stream-sink 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "sec1", "serde", "sha2 0.10.6", "smallvec", @@ -1272,8 +1716,8 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.36.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "asn1_der", "bs58", @@ -1283,17 +1727,18 @@ dependencies = [ "futures", "futures-timer", "instant", - "lazy_static", "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support)", + "multistream-select 0.12.1 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "once_cell", "parking_lot 0.12.1", "pin-project", - "prost 0.11.3", - "prost-build 0.11.3", + "prost", + "prost-build", "rand 0.8.5", - "rw-stream-sink 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support)", + "rw-stream-sink 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "sec1", "serde", "sha2 0.10.6", "smallvec", @@ -1305,11 +1750,11 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.35.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "futures", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", "parking_lot 0.12.1", "smallvec", @@ -1318,11 +1763,11 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.36.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "futures", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", "parking_lot 0.12.1", "smallvec", @@ -1331,64 +1776,68 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.40.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.44.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "asynchronous-codec", - "base64", + "base64 0.20.0", "byteorder", "bytes", "fnv", "futures", "hex_fmt", "instant", - "libp2p-core 0.35.1", - "libp2p-swarm 0.38.0", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", - "prometheus-client 0.18.1", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prometheus-client", + "prost", + "prost-build", + "prost-codec 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "rand 0.8.5", "regex", "serde", "sha2 0.10.6", "smallvec", + "thiserror", "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-gossipsub" -version = "0.41.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.44.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "asynchronous-codec", - "base64", + "base64 0.20.0", "byteorder", "bytes", "fnv", "futures", "hex_fmt", "instant", - "libp2p-core 0.36.0", - "libp2p-swarm 0.39.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "prometheus-client 0.19.0", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prometheus-client", + "prost", + "prost-build", + "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "rand 0.8.5", "regex", "serde", "sha2 0.10.6", "smallvec", + "thiserror", "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-kad" -version = "0.39.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.43.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "arrayvec", "asynchronous-codec", @@ -1398,12 +1847,12 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.35.1", - "libp2p-swarm 0.38.0", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prost", + "prost-build", + "rand 0.8.5", "serde", "sha2 0.10.6", "smallvec", @@ -1415,8 +1864,8 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.41.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.43.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "arrayvec", "asynchronous-codec", @@ -1426,12 +1875,12 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.36.0", - "libp2p-swarm 0.39.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prost", + "prost-build", + "rand 0.8.5", "serde", "sha2 0.10.6", "smallvec", @@ -1441,200 +1890,356 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-mdns" +version = "0.43.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +dependencies = [ + "data-encoding", + "futures", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "log", + "rand 0.8.5", + "smallvec", + "socket2", + "tokio", + "trust-dns-proto", + "void", +] + +[[package]] +name = "libp2p-mdns" +version = "0.43.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" +dependencies = [ + "data-encoding", + "futures", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "log", + "rand 0.8.5", + "smallvec", + "socket2", + "tokio", + "trust-dns-proto", + "void", +] + [[package]] name = "libp2p-metrics" -version = "0.8.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.12.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ - "libp2p-core 0.35.1", - "libp2p-gossipsub 0.40.0", - "libp2p-swarm 0.38.0", - "prometheus-client 0.18.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "prometheus-client", ] [[package]] name = "libp2p-metrics" -version = "0.10.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.12.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ - "libp2p-core 0.36.0", - "libp2p-gossipsub 0.41.0", - "libp2p-swarm 0.39.0", - "prometheus-client 0.18.1", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.35.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-mplex" -version = "0.36.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.38.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.42.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "bytes", - "curve25519-dalek 3.2.1", + "curve25519-dalek 3.2.0", "futures", - "lazy_static", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", - "prost 0.11.3", - "prost-build 0.11.3", + "once_cell", + "prost", + "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] [[package]] name = "libp2p-noise" -version = "0.39.1" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.42.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "bytes", - "curve25519-dalek 3.2.1", + "curve25519-dalek 3.2.0", "futures", - "lazy_static", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "prost 0.11.3", - "prost-build 0.11.3", + "once_cell", + "prost", + "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha.2" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +dependencies = [ + "bytes", + "futures", + "futures-timer", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-tls 0.1.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.7", + "thiserror", + "tokio", +] + +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha.2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" +dependencies = [ + "bytes", + "futures", + "futures-timer", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-tls 0.1.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.7", + "thiserror", + "tokio", +] + [[package]] name = "libp2p-swarm" -version = "0.38.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.42.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] name = "libp2p-swarm" -version = "0.39.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.42.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] -name = "libp2p-swarm-derive" -version = "0.29.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +name = "libp2p-tcp" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ - "heck 0.4.0", - "quote", - "syn", + "futures", + "futures-timer", + "if-watch", + "libc", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "log", + "socket2", + "tokio", ] [[package]] -name = "libp2p-swarm-derive" -version = "0.30.1" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +name = "libp2p-tcp" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ - "heck 0.4.0", - "quote", - "syn", + "futures", + "futures-timer", + "if-watch", + "libc", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "log", + "socket2", + "tokio", ] [[package]] -name = "libp2p-tcp" -version = "0.35.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +name = "libp2p-tls" +version = "0.1.0-alpha.2" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +dependencies = [ + "futures", + "futures-rustls", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "rcgen 0.10.0", + "ring", + "rustls 0.20.7", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", +] + +[[package]] +name = "libp2p-tls" +version = "0.1.0-alpha.2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" +dependencies = [ + "futures", + "futures-rustls", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "rcgen 0.10.0", + "ring", + "rustls 0.20.7", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", +] + +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha.2" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", "futures", "futures-timer", - "if-addrs", - "ipnet", - "libc", - "libp2p-core 0.35.1", + "hex", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-noise 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", - "socket2", + "multihash", + "prost", + "prost-build", + "prost-codec 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", "tokio", + "tokio-util 0.7.4", + "webrtc", ] [[package]] -name = "libp2p-tcp" -version = "0.37.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +name = "libp2p-webrtc" +version = "0.4.0-alpha.2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", "futures", "futures-timer", + "hex", "if-watch", - "libc", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-noise 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "socket2", + "multihash", + "prost", + "prost-build", + "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", "tokio", + "tokio-util 0.7.4", + "webrtc", ] [[package]] name = "libp2p-yamux" -version = "0.39.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.43.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "futures", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -1642,11 +2247,12 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.40.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.43.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "futures", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -1654,9 +2260,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -1716,18 +2322,42 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "mio" version = "0.8.5" @@ -1742,14 +2372,14 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.14.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" dependencies = [ "arrayref", - "bs58", "byteorder", "data-encoding", + "multibase", "multihash", "percent-encoding", "serde", @@ -1758,11 +2388,22 @@ dependencies = [ "url", ] +[[package]] +name = "multibase" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" +dependencies = [ + "base-x", + "data-encoding", + "data-encoding-macro", +] + [[package]] name = "multihash" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "core2", "digest 0.10.6", @@ -1795,8 +2436,8 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.11.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.12.1" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "bytes", "futures", @@ -1808,8 +2449,8 @@ dependencies = [ [[package]] name = "multistream-select" -version = "0.11.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.12.1" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "bytes", "futures", @@ -1878,22 +2519,23 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" dependencies = [ - "async-io", "bytes", "futures", "libc", "log", + "tokio", ] [[package]] name = "nix" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", "cfg-if", "libc", + "memoffset", ] [[package]] @@ -1902,6 +2544,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +[[package]] +name = "nom" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1912,6 +2564,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -1933,19 +2596,37 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ "hermit-abi", "libc", ] +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs 0.3.1", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs 0.5.1", +] + [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "opaque-debug" @@ -1957,13 +2638,45 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" name = "os_str_bytes" version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "p384" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] [[package]] -name = "overload" -version = "0.1.1" +name = "packed_simd_2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm", +] [[package]] name = "parking" @@ -1979,7 +2692,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -1994,9 +2707,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -2021,9 +2734,27 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" + +[[package]] +name = "pem" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] [[package]] name = "percent-encoding" @@ -2073,11 +2804,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "polling" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg", "cfg-if", @@ -2098,6 +2845,17 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "polyval" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +dependencies = [ + "cpuid-bool", + "opaque-debug", + "universal-hash", +] + [[package]] name = "polyval" version = "0.5.3" @@ -2118,9 +2876,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "2c8992a85d8e93a28bdf76137db888d3874e3b230dee5ed8bebac4c9f7617773" dependencies = [ "proc-macro2", "syn", @@ -2162,55 +2920,33 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] -[[package]] -name = "prometheus-client" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" -dependencies = [ - "dtoa", - "itoa", - "parking_lot 0.12.1", - "prometheus-client-derive-text-encode", -] - [[package]] name = "prometheus-client" version = "0.19.0" -source = "git+https://github.com/prometheus/client_rust.git?rev=682b24ee8c6c857b76c0683b1dd7df5a97b75c27#682b24ee8c6c857b76c0683b1dd7df5a97b75c27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e" dependencies = [ "dtoa", "itoa", "parking_lot 0.12.1", "prometheus-client-derive-encode", - "prost 0.9.0", - "prost-build 0.9.0", - "prost-types 0.9.0", - "void", + "prost", + "prost-build", + "prost-types", ] [[package]] name = "prometheus-client-derive-encode" -version = "0.3.1" -source = "git+https://github.com/prometheus/client_rust.git?rev=682b24ee8c6c857b76c0683b1dd7df5a97b75c27#682b24ee8c6c857b76c0683b1dd7df5a97b75c27" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prometheus-client-derive-text-encode" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" +checksum = "954bf540143bc26dc3a12363b6cc164eb4e208eaa2228f68558ca846ff57e6e2" dependencies = [ "proc-macro2", "quote", @@ -2219,84 +2955,65 @@ dependencies = [ [[package]] name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - -[[package]] -name = "prost" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" +checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592" dependencies = [ "bytes", - "prost-derive 0.11.2", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.9.0" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +checksum = "cb5320c680de74ba083512704acb90fe00f28f79207286a848e730c45dd73ed6" dependencies = [ "bytes", - "heck 0.3.3", + "heck", "itertools", "lazy_static", "log", "multimap", "petgraph", - "prost 0.9.0", - "prost-types 0.9.0", + "prettyplease", + "prost", + "prost-types", "regex", + "syn", "tempfile", "which", ] [[package]] -name = "prost-build" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604" +name = "prost-codec" +version = "0.3.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ + "asynchronous-codec", "bytes", - "heck 0.4.0", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost 0.11.3", - "prost-types 0.11.2", - "regex", - "syn", - "tempfile", - "which", + "prost", + "thiserror", + "unsigned-varint", ] [[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +name = "prost-codec" +version = "0.3.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", + "asynchronous-codec", + "bytes", + "prost", + "thiserror", + "unsigned-varint", ] [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720" dependencies = [ "anyhow", "itertools", @@ -2307,22 +3024,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost 0.9.0", -] - -[[package]] -name = "prost-types" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "017f79637768cde62820bc2d4fe0e45daaa027755c323ad077767c6c5f173091" dependencies = [ "bytes", - "prost 0.11.3", + "prost", ] [[package]] @@ -2331,11 +3038,29 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quinn-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls 0.20.7", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki 0.22.0", +] + [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -2411,6 +3136,31 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rcgen" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +dependencies = [ + "pem", + "ring", + "time", + "x509-parser 0.13.2", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -2461,7 +3211,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -2499,6 +3249,17 @@ dependencies = [ "quick-error", ] +[[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint", + "hmac 0.12.1", + "zeroize", +] + [[package]] name = "ring" version = "0.16.20" @@ -2514,21 +3275,52 @@ dependencies = [ "winapi", ] +[[package]] +name = "rtcp" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" +dependencies = [ + "bytes", + "thiserror", + "webrtc-util", +] + [[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "async-global-executor", "futures", "log", "netlink-packet-route", "netlink-proto", "nix", "thiserror", + "tokio", +] + +[[package]] +name = "rtp" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" +dependencies = [ + "async-trait", + "bytes", + "rand 0.8.5", + "serde", + "thiserror", + "webrtc-util", ] +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc_version" version = "0.4.0" @@ -2538,10 +3330,44 @@ dependencies = [ "semver", ] +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", +] + [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "futures", "pin-project", @@ -2551,7 +3377,7 @@ dependencies = [ [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "futures", "pin-project", @@ -2560,9 +3386,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "scopeguard" @@ -2572,21 +3398,67 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sdp" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror", + "url", +] + +[[package]] +name = "sec1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] @@ -2602,9 +3474,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -2613,9 +3485,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -2624,9 +3496,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" dependencies = [ "proc-macro2", "quote", @@ -2713,11 +3585,24 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + [[package]] name = "signature" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest 0.10.6", + "rand_core 0.6.4", +] [[package]] name = "slab" @@ -2740,10 +3625,10 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ - "aes-gcm", + "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.2", + "curve25519-dalek 4.0.0-pre.5", "rand_core 0.6.4", "ring", "rustc_version", @@ -2767,7 +3652,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "futures", "httparse", @@ -2782,17 +3667,55 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "stun" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" +dependencies = [ + "base64 0.13.1", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", +] [[package]] -name = "strsim" -version = "0.10.0" +name = "substring" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] [[package]] name = "subtle" @@ -2802,9 +3725,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.104" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -2898,18 +3821,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -2925,6 +3848,43 @@ dependencies = [ "once_cell", ] +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -2942,9 +3902,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.22.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ "autocfg", "bytes", @@ -2952,17 +3912,19 @@ dependencies = [ "memchr", "mio", "num_cpus", + "parking_lot 0.12.1", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -3012,9 +3974,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "serde", ] @@ -3089,9 +4051,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", "cfg-if", @@ -3103,32 +4065,33 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", + "socket2", "thiserror", "tinyvec", "tokio", + "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ "cfg-if", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", "tokio", + "tracing", "trust-dns-proto", ] @@ -3138,11 +4101,30 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +[[package]] +name = "turn" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" +dependencies = [ + "async-trait", + "base64 0.13.1", + "futures", + "log", + "md-5", + "rand 0.8.5", + "ring", + "stun", + "thiserror", + "tokio", + "webrtc-util", +] + [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "uint" @@ -3164,9 +4146,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -3177,12 +4159,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - [[package]] name = "unicode-width" version = "0.1.10" @@ -3232,6 +4208,15 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "uuid" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +dependencies = [ + "getrandom 0.2.8", +] + [[package]] name = "valuable" version = "0.1.0" @@ -3250,6 +4235,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + [[package]] name = "waker-fn" version = "1.1.0" @@ -3369,6 +4363,238 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webrtc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "hex", + "interceptor", + "lazy_static", + "log", + "rand 0.8.5", + "rcgen 0.9.3", + "regex", + "ring", + "rtcp", + "rtp", + "rustls 0.19.1", + "sdp", + "serde", + "serde_json", + "sha2 0.10.6", + "stun", + "thiserror", + "time", + "tokio", + "turn", + "url", + "waitgroup", + "webrtc-data", + "webrtc-dtls", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "webrtc-data" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" +dependencies = [ + "bytes", + "derive_builder", + "log", + "thiserror", + "tokio", + "webrtc-sctp", + "webrtc-util", +] + +[[package]] +name = "webrtc-dtls" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f" +dependencies = [ + "aes 0.6.0", + "aes-gcm 0.8.0", + "async-trait", + "bincode", + "block-modes", + "byteorder", + "ccm", + "curve25519-dalek 3.2.0", + "der-parser 8.1.0", + "elliptic-curve", + "hkdf", + "hmac 0.10.1", + "log", + "oid-registry 0.6.1", + "p256", + "p384", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen 0.9.3", + "ring", + "rustls 0.19.1", + "sec1", + "serde", + "sha-1", + "sha2 0.9.9", + "signature", + "subtle", + "thiserror", + "tokio", + "webpki 0.21.4", + "webrtc-util", + "x25519-dalek 2.0.0-pre.1", + "x509-parser 0.13.2", +] + +[[package]] +name = "webrtc-ice" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7" +dependencies = [ + "arc-swap", + "async-trait", + "crc", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "stun", + "thiserror", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util", +] + +[[package]] +name = "webrtc-mdns" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" +dependencies = [ + "log", + "socket2", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-media" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" +dependencies = [ + "byteorder", + "bytes", + "derive_builder", + "displaydoc", + "rand 0.8.5", + "rtp", + "thiserror", + "webrtc-util", +] + +[[package]] +name = "webrtc-sctp" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "rand 0.8.5", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-srtp" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" +dependencies = [ + "aead 0.4.3", + "aes 0.7.5", + "aes-gcm 0.9.4", + "async-trait", + "byteorder", + "bytes", + "ctr 0.8.0", + "hmac 0.11.0", + "log", + "rtcp", + "rtp", + "sha-1", + "subtle", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" +dependencies = [ + "async-trait", + "bitflags", + "bytes", + "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", +] + [[package]] name = "wepoll-ffi" version = "0.1.2" @@ -3537,15 +4763,63 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "1.2.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" +checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" dependencies = [ - "curve25519-dalek 3.2.1", + "curve25519-dalek 3.2.0", "rand_core 0.5.1", "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "2.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +dependencies = [ + "curve25519-dalek 3.2.0", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +dependencies = [ + "asn1-rs 0.3.1", + "base64 0.13.1", + "data-encoding", + "der-parser 7.0.0", + "lazy_static", + "nom", + "oid-registry 0.4.0", + "ring", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +dependencies = [ + "asn1-rs 0.5.1", + "base64 0.13.1", + "data-encoding", + "der-parser 8.1.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + [[package]] name = "yamux" version = "0.10.2" @@ -3560,20 +4834,29 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yasna" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +dependencies = [ + "time", +] + [[package]] name = "zeroize" -version = "1.3.0" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", diff --git a/censoring/Cargo.toml b/censoring/Cargo.toml index d231371..32d3226 100644 --- a/censoring/Cargo.toml +++ b/censoring/Cargo.toml @@ -9,20 +9,13 @@ edition = "2021" chrono = { version = "0.4.19", default-features = false, features = ["clock"] } delay_map = "0.1.1" -# TODO: -# * Switch back from the forked one, once the `protobuf` encoding is supported in rust-libp2p (libp2p-gossipsub). -# * See https://github.com/libp2p/rust-libp2p/pull/2911 for the progress to support the `protobuf` encoding. -# libp2p = { version = "0.48.0", default-features = false, features = ["gossipsub", "dns-tokio", "tcp-tokio", "noise", "mplex", "yamux", "serde"] } -# NOTE: -# * We are using the fork whose metrics encoding format is fixed to `protobuf`. -# https://github.com/libp2p/rust-libp2p/compare/master...ackintosh:rust-libp2p:prometheus-ptotobuf-support -# * That is due to that `protobuf` encoding is not supported in rust-libp2p (libp2p-gossipsub) yet. -libp2p = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "prometheus-ptotobuf-support", default-features = false, features = ["gossipsub", "dns-tokio", "tcp-tokio", "noise", "mplex", "yamux", "serde"] } +# TODO: update libp2p once the next version has been released. +libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", rev = "26215286391cc277270d6bbc88d3b2fc0de54c7d", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } # This is a fork of `libp2p` in order to implement malicious behaviour in the `attacker` module. # This `libp2p-testground` is used in `attacker` module instead of `libp2p`. # See https://github.com/ackintosh/rust-libp2p/pull/50 -libp2p-testground = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "testground", package = "libp2p", default-features = false, features = ["gossipsub", "dns-tokio", "tcp-tokio", "noise", "mplex", "yamux", "serde"] } +libp2p-testground = { git = "https://github.com/ackintosh/rust-libp2p.git", rev = "8e8be3f465cb9815fd84184c32805541db546aa7", package = "libp2p", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } rand = "0.8.5" serde = "1.0.139" @@ -32,7 +25,6 @@ tokio = { version = "1.20.0", features = ["macros"] } tracing = "0.1.35" tracing-subscriber = { version = "0.3.14", features = ["env-filter"] } -# TODO: Update once v0.19.0 has been released. -prometheus-client = { git = "https://github.com/prometheus/client_rust.git", rev = "682b24ee8c6c857b76c0683b1dd7df5a97b75c27", features = ["protobuf"] } +prometheus-client = { version = "0.19.0", features = ["protobuf"] } prost = "0.11" diff --git a/censoring/Dockerfile b/censoring/Dockerfile index 209bcc7..eda8807 100644 --- a/censoring/Dockerfile +++ b/censoring/Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile is for the `docker:generic` builder. # See https://docs.testground.ai/builder-library/docker-generic for details about the builder. -FROM rust:1.62-bullseye as builder +FROM rust:1.65-bullseye as builder WORKDIR /usr/src/test-plan # * `prost-build`, a dependency of `libp2p-gossipsub`, requires cmake. diff --git a/censoring/src/attacker.rs b/censoring/src/attacker.rs index 91c12ac..8c7d633 100644 --- a/censoring/src/attacker.rs +++ b/censoring/src/attacker.rs @@ -23,13 +23,13 @@ use libp2p_testground::swarm::{ ConnectionHandler, IntoConnectionHandler, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters, SwarmBuilder, SwarmEvent, }; -use libp2p_testground::tcp::{GenTcpConfig, TokioTcpTransport}; +use libp2p_testground::tcp::tokio::Transport as TcpTransport; +use libp2p_testground::tcp::Config; use libp2p_testground::yamux::YamuxConfig; use libp2p_testground::Transport; use libp2p_testground::{PeerId, Swarm}; use prost::Message; use std::collections::VecDeque; -use std::sync::Arc; use std::task::{Context, Poll}; use std::time::Duration; use testground::client::Client; @@ -90,24 +90,19 @@ pub(crate) async fn run( } fn build_swarm(keypair: Keypair) -> Swarm { - SwarmBuilder::new( + SwarmBuilder::with_tokio_executor( build_transport(&keypair), MaliciousBehaviour::new(), PeerId::from(keypair.public()), ) - .executor(Box::new(|future| { - tokio::spawn(future); - })) .build() } fn build_transport( keypair: &Keypair, ) -> libp2p_testground::core::transport::Boxed<(PeerId, StreamMuxerBox)> { - let transport = TokioDnsConfig::system(TokioTcpTransport::new( - GenTcpConfig::default().nodelay(true), - )) - .expect("DNS config"); + let transport = TokioDnsConfig::system(TcpTransport::new(Config::default().nodelay(true))) + .expect("DNS config"); let noise_keys = libp2p_testground::noise::Keypair::::new() .into_authentic(keypair) @@ -125,7 +120,7 @@ fn build_transport( } type GossipsubNetworkBehaviourAction = - NetworkBehaviourAction>; + NetworkBehaviourAction; pub struct MaliciousBehaviour { /// Configuration providing gossipsub performance parameters. @@ -225,7 +220,7 @@ impl MaliciousBehaviour { self.events .push_back(NetworkBehaviourAction::NotifyHandler { peer_id, - event: Arc::new(GossipsubHandlerIn::Message(message)), + event: GossipsubHandlerIn::Message(message), handler: NotifyHandler::Any, }) } @@ -415,10 +410,7 @@ impl NetworkBehaviour for MaliciousBehaviour { _params: &mut impl PollParameters, ) -> Poll> { if let Some(event) = self.events.pop_front() { - return Poll::Ready(event.map_in(|e: Arc| { - // clone send event reference if others references are present - Arc::try_unwrap(e).unwrap_or_else(|e| (*e).clone()) - })); + return Poll::Ready(event); } loop { diff --git a/censoring/src/honest.rs b/censoring/src/honest.rs index a408ff5..fd995f9 100644 --- a/censoring/src/honest.rs +++ b/censoring/src/honest.rs @@ -18,12 +18,12 @@ use libp2p::identity::Keypair; use libp2p::mplex::MplexConfig; use libp2p::noise::NoiseConfig; use libp2p::swarm::{DialError, SwarmBuilder, SwarmEvent}; -use libp2p::tcp::{GenTcpConfig, TokioTcpTransport}; +use libp2p::tcp::tokio::Transport as TcpTransport; +use libp2p::tcp::Config as TcpConfig; use libp2p::yamux::YamuxConfig; use libp2p::PeerId; use libp2p::Transport; use libp2p::{Multiaddr, Swarm}; -use prometheus_client::encoding::proto::EncodeMetric; use prometheus_client::registry::Registry; use rand::seq::SliceRandom; use rand::SeedableRng; @@ -93,7 +93,7 @@ pub(crate) async fn run( // //////////////////////////////////////////////////////////////////////// // Start libp2p // //////////////////////////////////////////////////////////////////////// - let mut registry: Registry> = Registry::default(); + let mut registry = Registry::default(); registry.sub_registry_with_prefix("gossipsub"); let network_send = spawn_honest_network( @@ -154,7 +154,7 @@ pub(crate) async fn run( // Encode the metrics to an instance of the OpenMetrics protobuf format. // https://github.com/OpenObservability/OpenMetrics/blob/main/proto/openmetrics_data_model.proto - let metric_set = prometheus_client::encoding::proto::encode(®istry); + let metric_set = prometheus_client::encoding::protobuf::encode(®istry)?; let mut queries = vec![]; @@ -249,10 +249,8 @@ pub(crate) async fn run( /// Set up an encrypted TCP transport over the Mplex and Yamux protocols. fn build_transport(keypair: &Keypair) -> libp2p::core::transport::Boxed<(PeerId, StreamMuxerBox)> { - let transport = TokioDnsConfig::system(TokioTcpTransport::new( - GenTcpConfig::default().nodelay(true), - )) - .expect("DNS config"); + let transport = TokioDnsConfig::system(TcpTransport::new(TcpConfig::default().nodelay(true))) + .expect("DNS config"); let noise_keys = libp2p::noise::Keypair::::new() .into_authentic(keypair) @@ -297,7 +295,7 @@ pub(crate) struct HonestNetwork { impl HonestNetwork { #[allow(clippy::too_many_arguments)] fn new( - registry: &mut Registry>, + registry: &mut Registry, keypair: Keypair, instance_info: InstanceInfo, participants: &Vec, @@ -333,14 +331,11 @@ impl HonestNetwork { gs }; - let swarm = SwarmBuilder::new( + let swarm = SwarmBuilder::with_tokio_executor( build_transport(&keypair), gossipsub, PeerId::from(keypair.public()), ) - .executor(Box::new(|future| { - tokio::spawn(future); - })) .build(); let mut peer_to_instance_name = HashMap::new(); @@ -443,7 +438,7 @@ impl HonestNetwork { } async fn spawn_honest_network( - registry: &mut Registry>, + registry: &mut Registry, keypair: Keypair, instance_info: InstanceInfo, participants: &Vec, diff --git a/censoring/src/utils.rs b/censoring/src/utils.rs index 351f4be..c5cd7be 100644 --- a/censoring/src/utils.rs +++ b/censoring/src/utils.rs @@ -2,12 +2,12 @@ use crate::InstanceInfo; use chrono::{DateTime, Local, Utc}; use libp2p::futures::FutureExt; use libp2p::futures::{Stream, StreamExt}; -use prometheus_client::encoding::proto::openmetrics_data_model::counter_value; -use prometheus_client::encoding::proto::openmetrics_data_model::gauge_value; -use prometheus_client::encoding::proto::openmetrics_data_model::metric_point; -use prometheus_client::encoding::proto::openmetrics_data_model::Metric; -use prometheus_client::encoding::proto::openmetrics_data_model::MetricFamily; -use prometheus_client::encoding::proto::HistogramValue; +use prometheus_client::encoding::protobuf::openmetrics_data_model::counter_value; +use prometheus_client::encoding::protobuf::openmetrics_data_model::gauge_value; +use prometheus_client::encoding::protobuf::openmetrics_data_model::metric_point; +use prometheus_client::encoding::protobuf::openmetrics_data_model::HistogramValue; +use prometheus_client::encoding::protobuf::openmetrics_data_model::Metric; +use prometheus_client::encoding::protobuf::openmetrics_data_model::MetricFamily; use serde::de::DeserializeOwned; use serde::Serialize; use serde_json::Value; From 71788010a057488c9bc5d84cc26d4dfe96743f20 Mon Sep 17 00:00:00 2001 From: ackintosh Date: Fri, 6 Jan 2023 23:50:10 +0900 Subject: [PATCH 02/10] scoring: Update libp2p to the latest revision --- scoring/Cargo.lock | 1931 +++++++++++++++++++++++++++++------- scoring/Cargo.toml | 7 +- scoring/Dockerfile | 2 +- scoring/src/attacker.rs | 22 +- scoring/src/beacon_node.rs | 25 +- scoring/src/utils.rs | 8 +- 6 files changed, 1615 insertions(+), 380 deletions(-) diff --git a/scoring/Cargo.lock b/scoring/Cargo.lock index a59b42d..2516831 100644 --- a/scoring/Cargo.lock +++ b/scoring/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array", +] + [[package]] name = "aead" version = "0.4.3" @@ -9,6 +18,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array", + "rand_core 0.6.4", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher 0.2.5", ] [[package]] @@ -18,25 +39,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug", ] +[[package]] +name = "aes-gcm" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +dependencies = [ + "aead 0.3.2", + "aes 0.6.0", + "cipher 0.2.5", + "ctr 0.6.0", + "ghash 0.3.1", + "subtle", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", + "aead 0.4.3", + "aes 0.7.5", + "cipher 0.3.0", + "ctr 0.8.0", + "ghash 0.4.4", "subtle", ] +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + [[package]] name = "ahash" version = "0.7.6" @@ -72,6 +127,12 @@ version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + [[package]] name = "arrayref" version = "0.3.6" @@ -85,51 +146,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "asn1_der" -version = "0.7.5" +name = "asn1-rs" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive 0.1.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] [[package]] -name = "async-channel" -version = "1.8.0" +name = "asn1-rs" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", ] [[package]] -name = "async-executor" -version = "1.5.0" +name = "asn1-rs-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", + "proc-macro2", + "quote", + "syn", + "synstructure", ] [[package]] -name = "async-global-executor" -version = "2.3.1" +name = "asn1-rs-derive" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", + "proc-macro2", + "quote", + "syn", + "synstructure", ] +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "asn1_der" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" + [[package]] name = "async-io" version = "1.12.0" @@ -160,12 +248,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - [[package]] name = "async-trait" version = "0.1.59" @@ -202,12 +284,45 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -254,19 +369,21 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.3.0" +name = "block-modes" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", + "block-padding", + "cipher 0.2.5", ] +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + [[package]] name = "bls" version = "0.2.0" @@ -351,6 +468,17 @@ version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +[[package]] +name = "ccm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" +dependencies = [ + "aead 0.3.2", + "cipher 0.2.5", + "subtle", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -364,7 +492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "zeroize", ] @@ -375,9 +503,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead", + "aead 0.4.3", "chacha20", - "cipher", + "cipher 0.3.0", "poly1305", "zeroize", ] @@ -395,6 +523,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] + [[package]] name = "cipher" version = "0.3.0" @@ -424,7 +561,7 @@ version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro-error", "proc-macro2", "quote", @@ -473,6 +610,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-oid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" + [[package]] name = "core-foundation" version = "0.9.3" @@ -507,6 +650,27 @@ dependencies = [ "libc", ] +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + +[[package]] +name = "crc" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" + [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -537,7 +701,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.7.1", "scopeguard", ] @@ -556,6 +720,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -566,13 +742,42 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "ctr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +dependencies = [ + "cipher 0.2.5", +] + [[package]] name = "ctr" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", ] [[package]] @@ -721,6 +926,26 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +[[package]] +name = "data-encoding-macro" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" +dependencies = [ + "data-encoding", + "data-encoding-macro-internal", +] + +[[package]] +name = "data-encoding-macro-internal" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" +dependencies = [ + "data-encoding", + "syn", +] + [[package]] name = "delay_map" version = "0.1.2" @@ -731,6 +956,45 @@ dependencies = [ "tokio-util 0.6.10", ] +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs 0.3.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "8.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +dependencies = [ + "asn1-rs 0.5.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + [[package]] name = "derivative" version = "2.2.0" @@ -742,6 +1006,37 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling 0.14.2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn", +] + [[package]] name = "digest" version = "0.9.0" @@ -762,12 +1057,35 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dtoa" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] + [[package]] name = "ed25519" version = "1.5.2" @@ -797,6 +1115,28 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +[[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "digest 0.10.6", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "encoding_rs" version = "0.8.31" @@ -808,11 +1148,11 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro2", "quote", "syn", @@ -946,6 +1286,16 @@ dependencies = [ "instant", ] +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "fixed-hash" version = "0.7.0" @@ -1060,6 +1410,17 @@ dependencies = [ "syn", ] +[[package]] +name = "futures-rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" +dependencies = [ + "futures-io", + "rustls 0.20.7", + "webpki 0.22.0", +] + [[package]] name = "futures-sink" version = "0.3.25" @@ -1138,6 +1499,16 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +dependencies = [ + "opaque-debug", + "polyval 0.4.5", +] + [[package]] name = "ghash" version = "0.4.4" @@ -1145,14 +1516,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug", - "polyval", + "polyval 0.5.3", ] [[package]] name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] [[package]] name = "h2" @@ -1197,15 +1579,6 @@ dependencies = [ "hashbrown 0.11.2", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.0" @@ -1233,6 +1606,44 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac 0.11.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "hostname" version = "0.3.1" @@ -1365,9 +1776,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd" +checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" dependencies = [ "async-io", "core-foundation", @@ -1378,6 +1789,7 @@ dependencies = [ "log", "rtnetlink", "system-configuration", + "tokio", "windows", ] @@ -1475,6 +1887,25 @@ dependencies = [ "bytes", ] +[[package]] +name = "interceptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" +dependencies = [ + "async-trait", + "bytes", + "log", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] + [[package]] name = "ipconfig" version = "0.3.1" @@ -1540,66 +1971,66 @@ checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libp2p" -version = "0.47.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.51.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "lazy_static", - "libp2p-core 0.35.1", - "libp2p-dns 0.35.0", - "libp2p-gossipsub 0.40.0", - "libp2p-kad 0.39.0", - "libp2p-metrics 0.8.0", - "libp2p-mplex 0.35.0", - "libp2p-noise 0.38.0", - "libp2p-swarm 0.38.0", - "libp2p-swarm-derive 0.29.0", - "libp2p-tcp 0.35.0", - "libp2p-yamux 0.39.0", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-dns 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-kad 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-mdns 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-metrics 0.12.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-mplex 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-noise 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-quic 0.7.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-tcp 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-webrtc 0.4.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-yamux 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "multiaddr", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p" -version = "0.49.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.51.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "lazy_static", - "libp2p-core 0.36.0", - "libp2p-dns 0.36.0", - "libp2p-gossipsub 0.41.0", - "libp2p-kad 0.41.0", - "libp2p-metrics 0.10.0", - "libp2p-mplex 0.36.0", - "libp2p-noise 0.39.1", - "libp2p-swarm 0.39.0", - "libp2p-swarm-derive 0.30.1", - "libp2p-tcp 0.37.0", - "libp2p-yamux 0.40.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-dns 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-kad 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-mdns 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-metrics 0.12.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-mplex 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-noise 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-quic 0.7.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-tcp 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-webrtc 0.4.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-yamux 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "multiaddr", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p-core" -version = "0.35.1" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "asn1_der", "bs58", @@ -1609,18 +2040,18 @@ dependencies = [ "futures", "futures-timer", "instant", - "lazy_static", "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=testground)", + "multistream-select 0.12.1 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "once_cell", "parking_lot 0.12.1", "pin-project", - "prost 0.11.3", - "prost-build 0.11.3", + "prost", + "prost-build", "rand 0.8.5", - "ring", - "rw-stream-sink 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=testground)", + "rw-stream-sink 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "sec1", "serde", "sha2 0.10.6", "smallvec", @@ -1632,8 +2063,8 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.36.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "asn1_der", "bs58", @@ -1643,17 +2074,18 @@ dependencies = [ "futures", "futures-timer", "instant", - "lazy_static", "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support)", + "multistream-select 0.12.1 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "once_cell", "parking_lot 0.12.1", "pin-project", - "prost 0.11.3", - "prost-build 0.11.3", + "prost", + "prost-build", "rand 0.8.5", - "rw-stream-sink 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support)", + "rw-stream-sink 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "sec1", "serde", "sha2 0.10.6", "smallvec", @@ -1665,11 +2097,11 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.35.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "futures", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", "parking_lot 0.12.1", "smallvec", @@ -1678,11 +2110,11 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.36.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "futures", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", "parking_lot 0.12.1", "smallvec", @@ -1691,64 +2123,68 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.40.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.44.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "asynchronous-codec", - "base64", + "base64 0.20.0", "byteorder", "bytes", "fnv", "futures", "hex_fmt", "instant", - "libp2p-core 0.35.1", - "libp2p-swarm 0.38.0", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", - "prometheus-client 0.18.1", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prometheus-client", + "prost", + "prost-build", + "prost-codec 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "rand 0.8.5", "regex", "serde", "sha2 0.10.6", "smallvec", + "thiserror", "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-gossipsub" -version = "0.41.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.44.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "asynchronous-codec", - "base64", + "base64 0.20.0", "byteorder", "bytes", "fnv", "futures", "hex_fmt", "instant", - "libp2p-core 0.36.0", - "libp2p-swarm 0.39.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "prometheus-client 0.19.0", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prometheus-client", + "prost", + "prost-build", + "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "rand 0.8.5", "regex", "serde", "sha2 0.10.6", "smallvec", + "thiserror", "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-kad" -version = "0.39.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.43.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "arrayvec", "asynchronous-codec", @@ -1758,12 +2194,12 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.35.1", - "libp2p-swarm 0.38.0", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prost", + "prost-build", + "rand 0.8.5", "serde", "sha2 0.10.6", "smallvec", @@ -1775,8 +2211,8 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.41.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.43.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "arrayvec", "asynchronous-codec", @@ -1786,12 +2222,12 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.36.0", - "libp2p-swarm 0.39.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prost", + "prost-build", + "rand 0.8.5", "serde", "sha2 0.10.6", "smallvec", @@ -1801,200 +2237,356 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-mdns" +version = "0.43.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +dependencies = [ + "data-encoding", + "futures", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "log", + "rand 0.8.5", + "smallvec", + "socket2", + "tokio", + "trust-dns-proto", + "void", +] + +[[package]] +name = "libp2p-mdns" +version = "0.43.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" +dependencies = [ + "data-encoding", + "futures", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "log", + "rand 0.8.5", + "smallvec", + "socket2", + "tokio", + "trust-dns-proto", + "void", +] + [[package]] name = "libp2p-metrics" -version = "0.8.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.12.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ - "libp2p-core 0.35.1", - "libp2p-gossipsub 0.40.0", - "libp2p-swarm 0.38.0", - "prometheus-client 0.18.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "prometheus-client", ] [[package]] name = "libp2p-metrics" -version = "0.10.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.12.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ - "libp2p-core 0.36.0", - "libp2p-gossipsub 0.41.0", - "libp2p-swarm 0.39.0", - "prometheus-client 0.18.1", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.35.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-mplex" -version = "0.36.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.38.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.42.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "lazy_static", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", - "prost 0.11.3", - "prost-build 0.11.3", + "once_cell", + "prost", + "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] [[package]] name = "libp2p-noise" -version = "0.39.1" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.42.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "lazy_static", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "prost 0.11.3", - "prost-build 0.11.3", + "once_cell", + "prost", + "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha.2" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +dependencies = [ + "bytes", + "futures", + "futures-timer", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-tls 0.1.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.7", + "thiserror", + "tokio", +] + +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha.2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" +dependencies = [ + "bytes", + "futures", + "futures-timer", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-tls 0.1.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.7", + "thiserror", + "tokio", +] + [[package]] name = "libp2p-swarm" -version = "0.38.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.42.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] name = "libp2p-swarm" -version = "0.39.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.42.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] -name = "libp2p-swarm-derive" -version = "0.29.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +name = "libp2p-tcp" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +dependencies = [ + "futures", + "futures-timer", + "if-watch", + "libc", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "log", + "socket2", + "tokio", +] + +[[package]] +name = "libp2p-tcp" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ - "heck 0.4.0", - "quote", - "syn", + "futures", + "futures-timer", + "if-watch", + "libc", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "log", + "socket2", + "tokio", ] [[package]] -name = "libp2p-swarm-derive" -version = "0.30.1" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +name = "libp2p-tls" +version = "0.1.0-alpha.2" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ - "heck 0.4.0", - "quote", - "syn", + "futures", + "futures-rustls", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "rcgen 0.10.0", + "ring", + "rustls 0.20.7", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", ] [[package]] -name = "libp2p-tcp" -version = "0.35.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +name = "libp2p-tls" +version = "0.1.0-alpha.2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" +dependencies = [ + "futures", + "futures-rustls", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "rcgen 0.10.0", + "ring", + "rustls 0.20.7", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", +] + +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha.2" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", "futures", "futures-timer", - "if-addrs", - "ipnet", - "libc", - "libp2p-core 0.35.1", + "hex", + "if-watch", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-noise 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", "log", - "socket2", + "multihash", + "prost", + "prost-build", + "prost-codec 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", "tokio", + "tokio-util 0.7.4", + "webrtc", ] [[package]] -name = "libp2p-tcp" -version = "0.37.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +name = "libp2p-webrtc" +version = "0.4.0-alpha.2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", "futures", "futures-timer", + "hex", "if-watch", - "libc", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "libp2p-noise 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "socket2", + "multihash", + "prost", + "prost-build", + "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", "tokio", + "tokio-util 0.7.4", + "webrtc", ] [[package]] name = "libp2p-yamux" -version = "0.39.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.43.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "futures", - "libp2p-core 0.35.1", + "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -2002,11 +2594,12 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.40.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.43.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "futures", - "libp2p-core 0.36.0", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -2102,12 +2695,30 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + [[package]] name = "memoffset" version = "0.7.1" @@ -2123,6 +2734,12 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "mio" version = "0.8.5" @@ -2137,14 +2754,14 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.14.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" dependencies = [ "arrayref", - "bs58", "byteorder", "data-encoding", + "multibase", "multihash", "percent-encoding", "serde", @@ -2153,11 +2770,22 @@ dependencies = [ "url", ] +[[package]] +name = "multibase" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" +dependencies = [ + "base-x", + "data-encoding", + "data-encoding-macro", +] + [[package]] name = "multihash" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "core2", "digest 0.10.6", @@ -2190,8 +2818,8 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.11.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.12.1" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "bytes", "futures", @@ -2203,8 +2831,8 @@ dependencies = [ [[package]] name = "multistream-select" -version = "0.11.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +version = "0.12.1" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "bytes", "futures", @@ -2273,11 +2901,11 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" dependencies = [ - "async-io", "bytes", "futures", "libc", "log", + "tokio", ] [[package]] @@ -2289,6 +2917,7 @@ dependencies = [ "bitflags", "cfg-if", "libc", + "memoffset 0.6.5", ] [[package]] @@ -2297,6 +2926,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +[[package]] +name = "nom" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "npg" version = "0.1.0" @@ -2359,6 +2998,24 @@ dependencies = [ "libc", ] +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs 0.3.1", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs 0.5.1", +] + [[package]] name = "once_cell" version = "1.16.0" @@ -2383,6 +3040,28 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "p384" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + [[package]] name = "parity-scale-codec" version = "2.3.1" @@ -2469,6 +3148,24 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +[[package]] +name = "pem" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.2.0" @@ -2517,6 +3214,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.26" @@ -2548,6 +3255,17 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "polyval" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +dependencies = [ + "cpuid-bool", + "opaque-debug", + "universal-hash", +] + [[package]] name = "polyval" version = "0.5.3" @@ -2647,64 +3365,32 @@ dependencies = [ "thiserror", ] -[[package]] -name = "prometheus-client" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" -dependencies = [ - "dtoa", - "itoa", - "parking_lot 0.12.1", - "prometheus-client-derive-text-encode", -] - [[package]] name = "prometheus-client" version = "0.19.0" -source = "git+https://github.com/prometheus/client_rust.git?rev=682b24ee8c6c857b76c0683b1dd7df5a97b75c27#682b24ee8c6c857b76c0683b1dd7df5a97b75c27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e" dependencies = [ "dtoa", "itoa", "parking_lot 0.12.1", "prometheus-client-derive-encode", - "prost 0.9.0", - "prost-build 0.9.0", - "prost-types 0.9.0", - "void", + "prost", + "prost-build", + "prost-types", ] [[package]] name = "prometheus-client-derive-encode" -version = "0.3.1" -source = "git+https://github.com/prometheus/client_rust.git?rev=682b24ee8c6c857b76c0683b1dd7df5a97b75c27#682b24ee8c6c857b76c0683b1dd7df5a97b75c27" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prometheus-client-derive-text-encode" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" +checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - [[package]] name = "prost" version = "0.11.3" @@ -2712,62 +3398,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" dependencies = [ "bytes", - "prost-derive 0.11.2", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.9.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604" dependencies = [ "bytes", - "heck 0.3.3", + "heck", "itertools", "lazy_static", "log", "multimap", "petgraph", - "prost 0.9.0", - "prost-types 0.9.0", + "prettyplease", + "prost", + "prost-types", "regex", + "syn", "tempfile", "which", ] [[package]] -name = "prost-build" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604" +name = "prost-codec" +version = "0.3.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ + "asynchronous-codec", "bytes", - "heck 0.4.0", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost 0.11.3", - "prost-types 0.11.2", - "regex", - "syn", - "tempfile", - "which", + "prost", + "thiserror", + "unsigned-varint", ] [[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +name = "prost-codec" +version = "0.3.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", + "asynchronous-codec", + "bytes", + "prost", + "thiserror", + "unsigned-varint", ] [[package]] @@ -2783,16 +3460,6 @@ dependencies = [ "syn", ] -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost 0.9.0", -] - [[package]] name = "prost-types" version = "0.11.2" @@ -2800,7 +3467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" dependencies = [ "bytes", - "prost 0.11.3", + "prost", ] [[package]] @@ -2815,6 +3482,24 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quinn-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls 0.20.7", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki 0.22.0", +] + [[package]] name = "quote" version = "1.0.21" @@ -2933,6 +3618,31 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "rcgen" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +dependencies = [ + "pem", + "ring", + "time", + "x509-parser 0.13.2", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -2983,7 +3693,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -3021,6 +3731,17 @@ dependencies = [ "quick-error", ] +[[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint", + "hmac 0.12.1", + "zeroize", +] + [[package]] name = "ring" version = "0.16.20" @@ -3046,19 +3767,44 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "rtcp" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" +dependencies = [ + "bytes", + "thiserror", + "webrtc-util", +] + [[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "async-global-executor", "futures", "log", "netlink-packet-route", "netlink-proto", "nix", "thiserror", + "tokio", +] + +[[package]] +name = "rtp" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" +dependencies = [ + "async-trait", + "bytes", + "rand 0.8.5", + "serde", + "thiserror", + "webrtc-util", ] [[package]] @@ -3076,6 +3822,12 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -3091,6 +3843,40 @@ dependencies = [ "semver", ] +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", +] + [[package]] name = "rustversion" version = "1.0.9" @@ -3100,7 +3886,7 @@ checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "futures", "pin-project", @@ -3110,7 +3896,7 @@ dependencies = [ [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=testground#846b897036df675464b1d2b54db1dd8ee3b606a2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7#8e8be3f465cb9815fd84184c32805541db546aa7" dependencies = [ "futures", "pin-project", @@ -3142,11 +3928,11 @@ dependencies = [ "delay_map", "futures", "gen_topology", - "libp2p 0.47.0", - "libp2p 0.49.0", + "libp2p 0.51.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p 0.51.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "npg", - "prometheus-client 0.19.0", - "prost 0.11.3", + "prometheus-client", + "prost", "rand 0.8.5", "serde", "serde_json", @@ -3165,6 +3951,52 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sdp" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror", + "url", +] + +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "semver" version = "1.0.14" @@ -3336,11 +4168,24 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + [[package]] name = "signature" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest 0.10.6", + "rand_core 0.6.4", +] [[package]] name = "slab" @@ -3380,7 +4225,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ - "aes-gcm", + "aes-gcm 0.9.4", "blake2", "chacha20poly1305", "curve25519-dalek 4.0.0-pre.1", @@ -3407,7 +4252,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "futures", "httparse", @@ -3420,7 +4265,17 @@ dependencies = [ name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] [[package]] name = "static_assertions" @@ -3449,13 +4304,41 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro2", "quote", "rustversion", "syn", ] +[[package]] +name = "stun" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" +dependencies = [ + "base64 0.13.1", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", +] + +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] + [[package]] name = "subtle" version = "2.4.1" @@ -3634,6 +4517,33 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -3643,6 +4553,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -3670,7 +4590,9 @@ dependencies = [ "memchr", "mio", "num_cpus", + "parking_lot 0.12.1", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", "winapi", @@ -3827,9 +4749,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", "cfg-if", @@ -3841,32 +4763,33 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", + "socket2", "thiserror", "tinyvec", "tokio", + "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ "cfg-if", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", "tokio", + "tracing", "trust-dns-proto", ] @@ -3876,6 +4799,25 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +[[package]] +name = "turn" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" +dependencies = [ + "async-trait", + "base64 0.13.1", + "futures", + "log", + "md-5", + "rand 0.8.5", + "ring", + "stun", + "thiserror", + "tokio", + "webrtc-util", +] + [[package]] name = "typenum" version = "1.15.0" @@ -3960,12 +4902,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - [[package]] name = "unicode-width" version = "0.1.10" @@ -4015,6 +4951,15 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "uuid" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +dependencies = [ + "getrandom 0.2.8", +] + [[package]] name = "valuable" version = "0.1.0" @@ -4039,6 +4984,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + [[package]] name = "waker-fn" version = "1.1.0" @@ -4158,6 +5112,238 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webrtc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "hex", + "interceptor", + "lazy_static", + "log", + "rand 0.8.5", + "rcgen 0.9.3", + "regex", + "ring", + "rtcp", + "rtp", + "rustls 0.19.1", + "sdp", + "serde", + "serde_json", + "sha2 0.10.6", + "stun", + "thiserror", + "time", + "tokio", + "turn", + "url", + "waitgroup", + "webrtc-data", + "webrtc-dtls", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "webrtc-data" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" +dependencies = [ + "bytes", + "derive_builder", + "log", + "thiserror", + "tokio", + "webrtc-sctp", + "webrtc-util", +] + +[[package]] +name = "webrtc-dtls" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f" +dependencies = [ + "aes 0.6.0", + "aes-gcm 0.8.0", + "async-trait", + "bincode", + "block-modes", + "byteorder", + "ccm", + "curve25519-dalek 3.2.0", + "der-parser 8.1.0", + "elliptic-curve", + "hkdf", + "hmac 0.10.1", + "log", + "oid-registry 0.6.1", + "p256", + "p384", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen 0.9.3", + "ring", + "rustls 0.19.1", + "sec1", + "serde", + "sha-1", + "sha2 0.9.9", + "signature", + "subtle", + "thiserror", + "tokio", + "webpki 0.21.4", + "webrtc-util", + "x25519-dalek 2.0.0-pre.1", + "x509-parser 0.13.2", +] + +[[package]] +name = "webrtc-ice" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7" +dependencies = [ + "arc-swap", + "async-trait", + "crc", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "stun", + "thiserror", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util", +] + +[[package]] +name = "webrtc-mdns" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" +dependencies = [ + "log", + "socket2", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-media" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" +dependencies = [ + "byteorder", + "bytes", + "derive_builder", + "displaydoc", + "rand 0.8.5", + "rtp", + "thiserror", + "webrtc-util", +] + +[[package]] +name = "webrtc-sctp" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "rand 0.8.5", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-srtp" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" +dependencies = [ + "aead 0.4.3", + "aes 0.7.5", + "aes-gcm 0.9.4", + "async-trait", + "byteorder", + "bytes", + "ctr 0.8.0", + "hmac 0.11.0", + "log", + "rtcp", + "rtp", + "sha-1", + "subtle", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" +dependencies = [ + "async-trait", + "bitflags", + "bytes", + "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", +] + [[package]] name = "wepoll-ffi" version = "0.1.2" @@ -4341,6 +5527,54 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "2.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +dependencies = [ + "curve25519-dalek 3.2.0", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +dependencies = [ + "asn1-rs 0.3.1", + "base64 0.13.1", + "data-encoding", + "der-parser 7.0.0", + "lazy_static", + "nom", + "oid-registry 0.4.0", + "ring", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +dependencies = [ + "asn1-rs 0.5.1", + "base64 0.13.1", + "data-encoding", + "der-parser 8.1.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + [[package]] name = "yaml-rust" version = "0.4.5" @@ -4364,6 +5598,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yasna" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +dependencies = [ + "time", +] + [[package]] name = "zeroize" version = "1.5.7" diff --git a/scoring/Cargo.toml b/scoring/Cargo.toml index 8a4f858..8a1eb64 100644 --- a/scoring/Cargo.toml +++ b/scoring/Cargo.toml @@ -10,9 +10,10 @@ chrono = { version = "0.4.19", default-features = false, features = ["clock"] } delay_map = "0.1.1" futures = "0.3.24" gen_topology = { git = "https://github.com/sigp/gossipsub-testground", rev = "4084d26b9210bc932f4aaa45f9506ecfe5f2bb04" } -libp2p = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "prometheus-ptotobuf-support", default-features = false, features = ["gossipsub", "dns-tokio", "tcp-tokio", "noise", "mplex", "yamux", "serde"] } +# TODO: update libp2p once the next version has been released. +libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", rev = "26215286391cc277270d6bbc88d3b2fc0de54c7d", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } npg = { git = "https://github.com/sigp/eth-npg", rev = "6118cdd63eb34ffa4b230d17e88c8adf7057e138" } -prometheus-client = { git = "https://github.com/prometheus/client_rust.git", rev = "682b24ee8c6c857b76c0683b1dd7df5a97b75c27", features = ["protobuf"] } +prometheus-client = { version = "0.19.0", features = ["protobuf"] } prost = "0.11" rand = "0.8.5" serde_json = "1.0" @@ -28,7 +29,7 @@ types = { git = "https://github.com/divagant-martian/lighthouse", branch = "size # This is a fork of `libp2p` in order to implement malicious behaviour in the `attacker` module. # This `libp2p-testground` is used in `attacker` module instead of `libp2p`. # See https://github.com/ackintosh/rust-libp2p/pull/50 -libp2p-testground = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "testground", package = "libp2p", default-features = false, features = ["gossipsub", "dns-tokio", "tcp-tokio", "noise", "mplex", "yamux", "serde"] } +libp2p-testground = { git = "https://github.com/ackintosh/rust-libp2p.git", rev = "8e8be3f465cb9815fd84184c32805541db546aa7", package = "libp2p", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } [patch] [patch.crates-io] diff --git a/scoring/Dockerfile b/scoring/Dockerfile index 9050740..d660bb6 100644 --- a/scoring/Dockerfile +++ b/scoring/Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile is for the `docker:generic` builder. # See https://docs.testground.ai/builder-library/docker-generic for details about the builder. -FROM rust:1.64-bullseye as builder +FROM rust:1.65-bullseye as builder WORKDIR /usr/src/test-plan # * `prost-build`, a dependency of `libp2p-gossipsub`, requires cmake. diff --git a/scoring/src/attacker.rs b/scoring/src/attacker.rs index cf465cf..dc37e81 100644 --- a/scoring/src/attacker.rs +++ b/scoring/src/attacker.rs @@ -29,7 +29,8 @@ use libp2p_testground::swarm::{ ConnectionHandler, IntoConnectionHandler, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters, SwarmBuilder, SwarmEvent, }; -use libp2p_testground::tcp::{GenTcpConfig, TokioTcpTransport}; +use libp2p_testground::tcp::tokio::Transport as TcpTransport; +use libp2p_testground::tcp::Config as TcpConfig; use libp2p_testground::yamux::YamuxConfig; use libp2p_testground::{Multiaddr, Transport}; use libp2p_testground::{PeerId, Swarm}; @@ -37,7 +38,6 @@ use prost::Message; use std::borrow::Cow; use std::collections::{HashMap, VecDeque}; use std::fmt::Debug; -use std::sync::Arc; use std::task::{Context, Poll}; use std::time::Duration; use testground::client::Client; @@ -108,22 +108,19 @@ pub(crate) async fn run(client: Client) -> Result<(), Box } fn build_swarm(keypair: Keypair) -> Swarm { - SwarmBuilder::new( + SwarmBuilder::with_tokio_executor( build_transport(&keypair), MaliciousBehaviour::new(), PeerId::from(keypair.public()), ) - .executor(Box::new(|future| { - tokio::spawn(future); - })) .build() } fn build_transport( keypair: &Keypair, ) -> libp2p_testground::core::transport::Boxed<(PeerId, StreamMuxerBox)> { - let transport = TokioDnsConfig::system(TokioTcpTransport::new( - GenTcpConfig::default().nodelay(true), + let transport = TokioDnsConfig::system(TcpTransport::new( + TcpConfig::default().nodelay(true), )) .expect("DNS config"); @@ -205,7 +202,7 @@ where } type GossipsubNetworkBehaviourAction = - NetworkBehaviourAction>; + NetworkBehaviourAction; pub struct MaliciousBehaviour { /// Configuration providing gossipsub performance parameters. @@ -316,7 +313,7 @@ impl MaliciousBehaviour { self.events .push_back(NetworkBehaviourAction::NotifyHandler { peer_id, - event: Arc::new(GossipsubHandlerIn::Message(message)), + event: GossipsubHandlerIn::Message(message), handler: NotifyHandler::Any, }) } @@ -519,10 +516,7 @@ impl NetworkBehaviour for MaliciousBehaviour { _params: &mut impl PollParameters, ) -> Poll> { if let Some(event) = self.events.pop_front() { - return Poll::Ready(event.map_in(|e: Arc| { - // clone send event reference if others references are present - Arc::try_unwrap(e).unwrap_or_else(|e| (*e).clone()) - })); + return Poll::Ready(event); } loop { diff --git a/scoring/src/beacon_node.rs b/scoring/src/beacon_node.rs index f2a54e8..5b15313 100644 --- a/scoring/src/beacon_node.rs +++ b/scoring/src/beacon_node.rs @@ -25,15 +25,15 @@ use libp2p::mplex::MplexConfig; use libp2p::multiaddr::Protocol; use libp2p::noise::NoiseConfig; use libp2p::swarm::{SwarmBuilder, SwarmEvent}; -use libp2p::tcp::{GenTcpConfig, TokioTcpTransport}; +use libp2p::tcp::tokio::Transport as TcpTransport; +use libp2p::tcp::Config as TcpConfig; use libp2p::yamux::YamuxConfig; use libp2p::{Multiaddr, Transport}; use libp2p::{PeerId, Swarm}; use npg::slot_generator::Subnet; use npg::slot_generator::ValId; use npg::{Generator, Message}; -use prometheus_client::encoding::proto::openmetrics_data_model::MetricSet; -use prometheus_client::encoding::proto::EncodeMetric; +use prometheus_client::encoding::protobuf::openmetrics_data_model::MetricSet; use prometheus_client::registry::Registry; use serde::{Deserialize, Serialize}; use sha2::{Digest, Sha256}; @@ -157,7 +157,7 @@ pub(crate) async fn run(client: Client) -> Result<(), Box // ///////////////////////////////////////////////////////////////////////////////////////////// // Start libp2p and dial the designated outbound peers // ///////////////////////////////////////////////////////////////////////////////////////////// - let mut registry: Registry> = Registry::default(); + let mut registry = Registry::default(); registry.sub_registry_with_prefix("gossipsub"); let mut network = Network::new( &mut registry, @@ -214,8 +214,8 @@ pub(crate) async fn run(client: Client) -> Result<(), Box /// Set up an encrypted TCP transport over the Mplex and Yamux protocols. fn build_transport(keypair: &Keypair) -> libp2p::core::transport::Boxed<(PeerId, StreamMuxerBox)> { - let transport = TokioDnsConfig::system(TokioTcpTransport::new( - GenTcpConfig::default().nodelay(true), + let transport = TokioDnsConfig::system(TcpTransport::new( + TcpConfig::default().nodelay(true), )) .expect("DNS config"); @@ -295,7 +295,7 @@ pub(crate) struct Network { impl Network { #[allow(clippy::too_many_arguments)] fn new( - registry: &mut Registry>, + registry: &mut Registry, keypair: Keypair, node_id: usize, beacon_node_info: BeaconNodeInfo, @@ -360,14 +360,11 @@ impl Network { gs }; - let swarm = SwarmBuilder::new( + let swarm = SwarmBuilder::with_tokio_executor( build_transport(&keypair), gossipsub, PeerId::from(keypair.public()), ) - .executor(Box::new(|future| { - tokio::spawn(future); - })) .build(); info!( @@ -507,7 +504,7 @@ impl Network { async fn run_sim( &mut self, run_duration: Duration, - registry: &Registry>, + registry: &Registry, ) { let deadline = tokio::time::sleep(run_duration); @@ -811,10 +808,10 @@ impl Network { } } - fn metrics_info(&self, registry: &Registry>) -> RecordMetricsInfo { + fn metrics_info(&self, registry: &Registry) -> RecordMetricsInfo { RecordMetricsInfo { client: self.client.clone(), - metrics: prometheus_client::encoding::proto::encode(registry), + metrics: prometheus_client::encoding::protobuf::encode(registry).unwrap(), peer_id: self.beacon_node_info.peer_id, current: Local::now(), } diff --git a/scoring/src/utils.rs b/scoring/src/utils.rs index 476a671..ad938c3 100644 --- a/scoring/src/utils.rs +++ b/scoring/src/utils.rs @@ -2,10 +2,10 @@ use crate::beacon_node::BeaconNodeInfo; use chrono::{DateTime, Local}; use libp2p::futures::StreamExt; use libp2p::PeerId; -use prometheus_client::encoding::proto::openmetrics_data_model::counter_value; -use prometheus_client::encoding::proto::openmetrics_data_model::metric_point; -use prometheus_client::encoding::proto::openmetrics_data_model::Metric; -use prometheus_client::encoding::proto::openmetrics_data_model::MetricFamily; +use prometheus_client::encoding::protobuf::openmetrics_data_model::counter_value; +use prometheus_client::encoding::protobuf::openmetrics_data_model::metric_point; +use prometheus_client::encoding::protobuf::openmetrics_data_model::Metric; +use prometheus_client::encoding::protobuf::openmetrics_data_model::MetricFamily; use serde::de::DeserializeOwned; use serde::Serialize; use std::borrow::Cow; From 012c494946b4ae92c5efc78734df6854286fb266 Mon Sep 17 00:00:00 2001 From: ackintosh Date: Mon, 9 Jan 2023 14:31:51 +0900 Subject: [PATCH 03/10] eth_consensus: Update libp2p to the latest revision --- eth_consensus/Cargo.lock | 1619 ++++++++++++++--- eth_consensus/simulation/Cargo.toml | 6 +- eth_consensus/simulation/src/network.rs | 3 +- .../simulation/src/network/metrics.rs | 4 +- eth_consensus/simulation/src/network/run.rs | 21 +- eth_consensus/simulation/src/utils.rs | 12 +- 6 files changed, 1405 insertions(+), 260 deletions(-) diff --git a/eth_consensus/Cargo.lock b/eth_consensus/Cargo.lock index 4d7f656..ea94452 100644 --- a/eth_consensus/Cargo.lock +++ b/eth_consensus/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array", +] + [[package]] name = "aead" version = "0.4.3" @@ -9,6 +18,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array", + "rand_core 0.6.4", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher 0.2.5", ] [[package]] @@ -18,25 +39,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug", ] +[[package]] +name = "aes-gcm" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +dependencies = [ + "aead 0.3.2", + "aes 0.6.0", + "cipher 0.2.5", + "ctr 0.6.0", + "ghash 0.3.1", + "subtle", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", + "aead 0.4.3", + "aes 0.7.5", + "cipher 0.3.0", + "ctr 0.8.0", + "ghash 0.4.4", "subtle", ] +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + [[package]] name = "ahash" version = "0.7.6" @@ -72,6 +127,12 @@ version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + [[package]] name = "arrayref" version = "0.3.6" @@ -85,51 +146,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "asn1_der" -version = "0.7.5" +name = "asn1-rs" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive 0.1.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.17", +] [[package]] -name = "async-channel" -version = "1.8.0" +name = "asn1-rs" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.17", ] [[package]] -name = "async-executor" -version = "1.5.0" +name = "asn1-rs-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", + "proc-macro2", + "quote", + "syn", + "synstructure", ] [[package]] -name = "async-global-executor" -version = "2.3.1" +name = "asn1-rs-derive" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] +[[package]] +name = "asn1_der" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" + [[package]] name = "async-io" version = "1.12.0" @@ -160,12 +248,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - [[package]] name = "async-trait" version = "0.1.59" @@ -202,12 +284,45 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -254,19 +369,21 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.3.0" +name = "block-modes" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", + "block-padding", + "cipher 0.2.5", ] +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + [[package]] name = "bls" version = "0.2.0" @@ -351,6 +468,17 @@ version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +[[package]] +name = "ccm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" +dependencies = [ + "aead 0.3.2", + "cipher 0.2.5", + "subtle", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -364,7 +492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "zeroize", ] @@ -375,9 +503,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead", + "aead 0.4.3", "chacha20", - "cipher", + "cipher 0.3.0", "poly1305", "zeroize", ] @@ -393,11 +521,20 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time", + "time 0.1.45", "wasm-bindgen", "winapi", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] + [[package]] name = "cipher" version = "0.3.0" @@ -442,7 +579,7 @@ version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro-error", "proc-macro2", "quote", @@ -455,7 +592,7 @@ version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro-error", "proc-macro2", "quote", @@ -513,6 +650,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-oid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" + [[package]] name = "core-foundation" version = "0.9.3" @@ -547,6 +690,27 @@ dependencies = [ "libc", ] +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + +[[package]] +name = "crc" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" + [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -577,7 +741,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.7.1", "scopeguard", ] @@ -596,6 +760,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -606,13 +782,42 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "ctr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +dependencies = [ + "cipher 0.2.5", +] + [[package]] name = "ctr" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", ] [[package]] @@ -761,6 +966,26 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +[[package]] +name = "data-encoding-macro" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" +dependencies = [ + "data-encoding", + "data-encoding-macro-internal", +] + +[[package]] +name = "data-encoding-macro-internal" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" +dependencies = [ + "data-encoding", + "syn", +] + [[package]] name = "delay_map" version = "0.1.2" @@ -771,6 +996,45 @@ dependencies = [ "tokio-util 0.6.10", ] +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs 0.3.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "8.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +dependencies = [ + "asn1-rs 0.5.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + [[package]] name = "derivative" version = "2.2.0" @@ -782,6 +1046,37 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling 0.14.2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn", +] + [[package]] name = "digest" version = "0.9.0" @@ -802,12 +1097,35 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dtoa" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] + [[package]] name = "ed25519" version = "1.5.2" @@ -837,6 +1155,28 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +[[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "digest 0.10.6", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "encoding_rs" version = "0.8.31" @@ -848,11 +1188,11 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro2", "quote", "syn", @@ -1007,6 +1347,16 @@ dependencies = [ "instant", ] +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "fixed-hash" version = "0.7.0" @@ -1121,6 +1471,17 @@ dependencies = [ "syn", ] +[[package]] +name = "futures-rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" +dependencies = [ + "futures-io", + "rustls 0.20.7", + "webpki 0.22.0", +] + [[package]] name = "futures-sink" version = "0.3.25" @@ -1207,6 +1568,16 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +dependencies = [ + "opaque-debug", + "polyval 0.4.5", +] + [[package]] name = "ghash" version = "0.4.4" @@ -1214,7 +1585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug", - "polyval", + "polyval 0.5.3", ] [[package]] @@ -1223,6 +1594,17 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "h2" version = "0.3.15" @@ -1266,15 +1648,6 @@ dependencies = [ "hashbrown 0.11.2", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.0" @@ -1311,6 +1684,44 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac 0.11.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "hostname" version = "0.3.1" @@ -1443,9 +1854,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd" +checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" dependencies = [ "async-io", "core-foundation", @@ -1456,6 +1867,7 @@ dependencies = [ "log", "rtnetlink", "system-configuration", + "tokio", "windows", ] @@ -1553,6 +1965,25 @@ dependencies = [ "bytes", ] +[[package]] +name = "interceptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" +dependencies = [ + "async-trait", + "bytes", + "log", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] + [[package]] name = "io-lifetimes" version = "1.0.3" @@ -1640,37 +2071,37 @@ checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libp2p" -version = "0.49.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.51.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "lazy_static", "libp2p-core", "libp2p-dns", "libp2p-gossipsub", "libp2p-kad", + "libp2p-mdns", "libp2p-metrics", "libp2p-mplex", "libp2p-noise", + "libp2p-quic", "libp2p-swarm", - "libp2p-swarm-derive", "libp2p-tcp", + "libp2p-webrtc", "libp2p-yamux", "multiaddr", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p-core" -version = "0.36.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "asn1_der", "bs58", @@ -1680,17 +2111,18 @@ dependencies = [ "futures", "futures-timer", "instant", - "lazy_static", "log", "multiaddr", "multihash", "multistream-select", + "once_cell", "parking_lot 0.12.1", "pin-project", - "prost 0.11.3", - "prost-build 0.11.3", + "prost", + "prost-build", "rand 0.8.5", "rw-stream-sink", + "sec1", "serde", "sha2 0.10.6", "smallvec", @@ -1702,8 +2134,8 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.36.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "futures", "libp2p-core", @@ -1715,11 +2147,11 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.41.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.44.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "asynchronous-codec", - "base64", + "base64 0.20.0", "byteorder", "bytes", "fnv", @@ -1729,22 +2161,24 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prometheus-client 0.19.0", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prometheus-client", + "prost", + "prost-build", + "prost-codec", + "rand 0.8.5", "regex", "serde", "sha2 0.10.6", "smallvec", + "thiserror", "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-kad" -version = "0.41.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.43.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "arrayvec", "asynchronous-codec", @@ -1757,9 +2191,9 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.11.3", - "prost-build 0.11.3", - "rand 0.7.3", + "prost", + "prost-build", + "rand 0.8.5", "serde", "sha2 0.10.6", "smallvec", @@ -1769,21 +2203,40 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-mdns" +version = "0.43.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +dependencies = [ + "data-encoding", + "futures", + "if-watch", + "libp2p-core", + "libp2p-swarm", + "log", + "rand 0.8.5", + "smallvec", + "socket2", + "tokio", + "trust-dns-proto", + "void", +] + [[package]] name = "libp2p-metrics" -version = "0.10.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.12.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "libp2p-core", "libp2p-gossipsub", "libp2p-swarm", - "prometheus-client 0.18.1", + "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.36.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "asynchronous-codec", "bytes", @@ -1792,36 +2245,57 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.39.1" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.42.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "lazy_static", "libp2p-core", "log", - "prost 0.11.3", - "prost-build 0.11.3", + "once_cell", + "prost", + "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha.2" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +dependencies = [ + "bytes", + "futures", + "futures-timer", + "if-watch", + "libp2p-core", + "libp2p-tls", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.7", + "thiserror", + "tokio", +] + [[package]] name = "libp2p-swarm" -version = "0.39.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.42.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "either", "fnv", @@ -1831,44 +2305,83 @@ dependencies = [ "libp2p-core", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] -name = "libp2p-swarm-derive" -version = "0.30.1" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +name = "libp2p-tcp" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ - "heck 0.4.0", - "quote", - "syn", + "futures", + "futures-timer", + "if-watch", + "libc", + "libp2p-core", + "log", + "socket2", + "tokio", ] [[package]] -name = "libp2p-tcp" -version = "0.37.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +name = "libp2p-tls" +version = "0.1.0-alpha.2" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ + "futures", + "futures-rustls", + "libp2p-core", + "rcgen 0.10.0", + "ring", + "rustls 0.20.7", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", +] + +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha.2" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", "futures", "futures-timer", + "hex", "if-watch", - "libc", "libp2p-core", + "libp2p-noise", "log", - "socket2", + "multihash", + "prost", + "prost-build", + "prost-codec", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", "tokio", + "tokio-util 0.7.4", + "webrtc", ] [[package]] name = "libp2p-yamux" -version = "0.40.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.43.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "futures", "libp2p-core", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -1970,12 +2483,30 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + [[package]] name = "memoffset" version = "0.7.1" @@ -1991,6 +2522,12 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "mio" version = "0.8.5" @@ -2005,14 +2542,14 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.14.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" dependencies = [ "arrayref", - "bs58", "byteorder", "data-encoding", + "multibase", "multihash", "percent-encoding", "serde", @@ -2021,11 +2558,22 @@ dependencies = [ "url", ] +[[package]] +name = "multibase" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" +dependencies = [ + "base-x", + "data-encoding", + "data-encoding-macro", +] + [[package]] name = "multihash" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "core2", "digest 0.10.6", @@ -2058,8 +2606,8 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.11.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +version = "0.12.1" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "bytes", "futures", @@ -2128,11 +2676,11 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" dependencies = [ - "async-io", "bytes", "futures", "libc", "log", + "tokio", ] [[package]] @@ -2144,6 +2692,7 @@ dependencies = [ "bitflags", "cfg-if", "libc", + "memoffset 0.6.5", ] [[package]] @@ -2152,6 +2701,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +[[package]] +name = "nom" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "npg" version = "0.1.0" @@ -2214,6 +2773,24 @@ dependencies = [ "libc", ] +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs 0.3.1", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs 0.5.1", +] + [[package]] name = "once_cell" version = "1.16.0" @@ -2238,6 +2815,28 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "p384" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + [[package]] name = "parity-scale-codec" version = "2.3.1" @@ -2324,6 +2923,24 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +[[package]] +name = "pem" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.2.0" @@ -2372,6 +2989,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.26" @@ -2403,6 +3030,17 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "polyval" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +dependencies = [ + "cpuid-bool", + "opaque-debug", + "universal-hash", +] + [[package]] name = "polyval" version = "0.5.3" @@ -2502,64 +3140,32 @@ dependencies = [ "thiserror", ] -[[package]] -name = "prometheus-client" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" -dependencies = [ - "dtoa", - "itoa", - "parking_lot 0.12.1", - "prometheus-client-derive-text-encode", -] - [[package]] name = "prometheus-client" version = "0.19.0" -source = "git+https://github.com/prometheus/client_rust.git?rev=682b24ee8c6c857b76c0683b1dd7df5a97b75c27#682b24ee8c6c857b76c0683b1dd7df5a97b75c27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e" dependencies = [ "dtoa", "itoa", "parking_lot 0.12.1", "prometheus-client-derive-encode", - "prost 0.9.0", - "prost-build 0.9.0", - "prost-types 0.9.0", - "void", + "prost", + "prost-build", + "prost-types", ] [[package]] name = "prometheus-client-derive-encode" -version = "0.3.1" -source = "git+https://github.com/prometheus/client_rust.git?rev=682b24ee8c6c857b76c0683b1dd7df5a97b75c27#682b24ee8c6c857b76c0683b1dd7df5a97b75c27" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prometheus-client-derive-text-encode" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" +checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - [[package]] name = "prost" version = "0.11.3" @@ -2567,27 +3173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" dependencies = [ "bytes", - "prost-derive 0.11.2", -] - -[[package]] -name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes", - "heck 0.3.3", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost 0.9.0", - "prost-types 0.9.0", - "regex", - "tempfile", - "which", + "prost-derive", ] [[package]] @@ -2597,15 +3183,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604" dependencies = [ "bytes", - "heck 0.4.0", + "heck", "itertools", "lazy_static", "log", "multimap", "petgraph", "prettyplease", - "prost 0.11.3", - "prost-types 0.11.2", + "prost", + "prost-types", "regex", "syn", "tempfile", @@ -2613,16 +3199,15 @@ dependencies = [ ] [[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +name = "prost-codec" +version = "0.3.0" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", + "asynchronous-codec", + "bytes", + "prost", + "thiserror", + "unsigned-varint", ] [[package]] @@ -2638,16 +3223,6 @@ dependencies = [ "syn", ] -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost 0.9.0", -] - [[package]] name = "prost-types" version = "0.11.2" @@ -2655,7 +3230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" dependencies = [ "bytes", - "prost 0.11.3", + "prost", ] [[package]] @@ -2670,6 +3245,24 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quinn-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls 0.20.7", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki 0.22.0", +] + [[package]] name = "quote" version = "1.0.21" @@ -2788,6 +3381,31 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "rcgen" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +dependencies = [ + "pem", + "ring", + "time 0.3.17", + "x509-parser 0.13.2", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time 0.3.17", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -2838,7 +3456,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -2876,6 +3494,17 @@ dependencies = [ "quick-error", ] +[[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint", + "hmac 0.12.1", + "zeroize", +] + [[package]] name = "ring" version = "0.16.20" @@ -2901,19 +3530,44 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "rtcp" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" +dependencies = [ + "bytes", + "thiserror", + "webrtc-util", +] + [[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "async-global-executor", "futures", "log", "netlink-packet-route", "netlink-proto", "nix", "thiserror", + "tokio", +] + +[[package]] +name = "rtp" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" +dependencies = [ + "async-trait", + "bytes", + "rand 0.8.5", + "serde", + "thiserror", + "webrtc-util", ] [[package]] @@ -2931,6 +3585,12 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -2946,6 +3606,15 @@ dependencies = [ "semver", ] +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + [[package]] name = "rustix" version = "0.36.4" @@ -2960,6 +3629,31 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", +] + [[package]] name = "rustversion" version = "1.0.9" @@ -2969,7 +3663,7 @@ checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-ptotobuf-support#16ab1e70ad9c93c59fa50808b9f665a6e33f820e" +source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" dependencies = [ "futures", "pin-project", @@ -2999,6 +3693,52 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sdp" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror", + "url", +] + +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "semver" version = "1.0.14" @@ -3170,11 +3910,24 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + [[package]] name = "signature" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest 0.10.6", + "rand_core 0.6.4", +] [[package]] name = "simulation" @@ -3186,7 +3939,7 @@ dependencies = [ "gen_topology", "libp2p", "npg", - "prometheus-client 0.19.0", + "prometheus-client", "rand 0.8.5", "serde", "serde_json", @@ -3236,7 +3989,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ - "aes-gcm", + "aes-gcm 0.9.4", "blake2", "chacha20poly1305", "curve25519-dalek 4.0.0-pre.1", @@ -3263,7 +4016,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "futures", "httparse", @@ -3278,6 +4031,16 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -3305,13 +4068,41 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro2", "quote", "rustversion", "syn", ] +[[package]] +name = "stun" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" +dependencies = [ + "base64 0.13.1", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", +] + +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] + [[package]] name = "subtle" version = "2.4.1" @@ -3501,6 +4292,33 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -3510,6 +4328,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -3537,7 +4365,9 @@ dependencies = [ "memchr", "mio", "num_cpus", + "parking_lot 0.12.1", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", "winapi", @@ -3695,9 +4525,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", "cfg-if", @@ -3709,32 +4539,33 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", + "socket2", "thiserror", "tinyvec", "tokio", + "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ "cfg-if", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", "tokio", + "tracing", "trust-dns-proto", ] @@ -3744,6 +4575,25 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +[[package]] +name = "turn" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" +dependencies = [ + "async-trait", + "base64 0.13.1", + "futures", + "log", + "md-5", + "rand 0.8.5", + "ring", + "stun", + "thiserror", + "tokio", + "webrtc-util", +] + [[package]] name = "typenum" version = "1.15.0" @@ -3828,12 +4678,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - [[package]] name = "unicode-width" version = "0.1.10" @@ -3883,6 +4727,15 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "uuid" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +dependencies = [ + "getrandom 0.2.8", +] + [[package]] name = "valuable" version = "0.1.0" @@ -3907,6 +4760,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + [[package]] name = "waker-fn" version = "1.1.0" @@ -4032,6 +4894,238 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webrtc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "hex", + "interceptor", + "lazy_static", + "log", + "rand 0.8.5", + "rcgen 0.9.3", + "regex", + "ring", + "rtcp", + "rtp", + "rustls 0.19.1", + "sdp", + "serde", + "serde_json", + "sha2 0.10.6", + "stun", + "thiserror", + "time 0.3.17", + "tokio", + "turn", + "url", + "waitgroup", + "webrtc-data", + "webrtc-dtls", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "webrtc-data" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" +dependencies = [ + "bytes", + "derive_builder", + "log", + "thiserror", + "tokio", + "webrtc-sctp", + "webrtc-util", +] + +[[package]] +name = "webrtc-dtls" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f" +dependencies = [ + "aes 0.6.0", + "aes-gcm 0.8.0", + "async-trait", + "bincode", + "block-modes", + "byteorder", + "ccm", + "curve25519-dalek 3.2.0", + "der-parser 8.1.0", + "elliptic-curve", + "hkdf", + "hmac 0.10.1", + "log", + "oid-registry 0.6.1", + "p256", + "p384", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen 0.9.3", + "ring", + "rustls 0.19.1", + "sec1", + "serde", + "sha-1", + "sha2 0.9.9", + "signature", + "subtle", + "thiserror", + "tokio", + "webpki 0.21.4", + "webrtc-util", + "x25519-dalek 2.0.0-pre.1", + "x509-parser 0.13.2", +] + +[[package]] +name = "webrtc-ice" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7" +dependencies = [ + "arc-swap", + "async-trait", + "crc", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "stun", + "thiserror", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util", +] + +[[package]] +name = "webrtc-mdns" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" +dependencies = [ + "log", + "socket2", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-media" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" +dependencies = [ + "byteorder", + "bytes", + "derive_builder", + "displaydoc", + "rand 0.8.5", + "rtp", + "thiserror", + "webrtc-util", +] + +[[package]] +name = "webrtc-sctp" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "rand 0.8.5", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-srtp" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" +dependencies = [ + "aead 0.4.3", + "aes 0.7.5", + "aes-gcm 0.9.4", + "async-trait", + "byteorder", + "bytes", + "ctr 0.8.0", + "hmac 0.11.0", + "log", + "rtcp", + "rtp", + "sha-1", + "subtle", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" +dependencies = [ + "async-trait", + "bitflags", + "bytes", + "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", +] + [[package]] name = "wepoll-ffi" version = "0.1.2" @@ -4215,6 +5309,54 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "2.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +dependencies = [ + "curve25519-dalek 3.2.0", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +dependencies = [ + "asn1-rs 0.3.1", + "base64 0.13.1", + "data-encoding", + "der-parser 7.0.0", + "lazy_static", + "nom", + "oid-registry 0.4.0", + "ring", + "rusticata-macros", + "thiserror", + "time 0.3.17", +] + +[[package]] +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +dependencies = [ + "asn1-rs 0.5.1", + "base64 0.13.1", + "data-encoding", + "der-parser 8.1.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time 0.3.17", +] + [[package]] name = "yaml-rust" version = "0.4.5" @@ -4238,6 +5380,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yasna" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +dependencies = [ + "time 0.3.17", +] + [[package]] name = "zeroize" version = "1.5.7" diff --git a/eth_consensus/simulation/Cargo.toml b/eth_consensus/simulation/Cargo.toml index b701632..6f05acd 100644 --- a/eth_consensus/simulation/Cargo.toml +++ b/eth_consensus/simulation/Cargo.toml @@ -9,9 +9,9 @@ edition = "2021" chrono = { version = "0.4.19", features = [ "std" ]} delay_map = "0.1.1" -# libp2p = { version = "0.48.0", default-features = false, features = ["gossipsub", "dns-tokio", "tcp-tokio", "noise", "mplex", "yamux", "serde"] } -prometheus-client = { git = "https://github.com/prometheus/client_rust.git", rev = "682b24ee8c6c857b76c0683b1dd7df5a97b75c27", features = ["protobuf"] } -libp2p = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "prometheus-ptotobuf-support", default-features = false, features = ["gossipsub", "dns-tokio", "tcp-tokio", "noise", "mplex", "yamux", "serde"] } +prometheus-client = { version = "0.19.0", features = ["protobuf"] } +# TODO: update libp2p once the next version has been released. +libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", rev = "26215286391cc277270d6bbc88d3b2fc0de54c7d", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } serde_json = "1.0" serde = "1.0" testground = "0.4.0" diff --git a/eth_consensus/simulation/src/network.rs b/eth_consensus/simulation/src/network.rs index f68bec5..eab4abb 100644 --- a/eth_consensus/simulation/src/network.rs +++ b/eth_consensus/simulation/src/network.rs @@ -9,7 +9,6 @@ use libp2p::swarm::SwarmEvent; use libp2p::PeerId; use libp2p::Swarm; use npg::Generator; -use prometheus_client::encoding::proto::EncodeMetric; use prometheus_client::registry::Registry; use rand::Rng; use std::collections::HashMap; @@ -36,7 +35,7 @@ pub struct Network { /// This nodes contact info. instance_info: InstanceInfo, /// Metrics registry. - registry: Registry>, + registry: Registry, /// Information of every other participant in the network, indexed by their (local to the test /// run) node_id. participants: HashMap, diff --git a/eth_consensus/simulation/src/network/metrics.rs b/eth_consensus/simulation/src/network/metrics.rs index bb6d175..21ad6d8 100644 --- a/eth_consensus/simulation/src/network/metrics.rs +++ b/eth_consensus/simulation/src/network/metrics.rs @@ -5,7 +5,7 @@ use crate::utils::{ use crate::InstanceInfo; use chrono::{DateTime, Utc}; use libp2p::gossipsub::IdentTopic; -use prometheus_client::encoding::proto::openmetrics_data_model::MetricSet; +use prometheus_client::encoding::protobuf::openmetrics_data_model::MetricSet; use std::sync::Arc; use testground::client::Client; use tracing::error; @@ -29,7 +29,7 @@ impl Network { pub(super) fn record_metrics_info(&self) -> RecordMetricsInfo { // Encode the metrics to an instance of the OpenMetrics protobuf format. // https://github.com/OpenObservability/OpenMetrics/blob/main/proto/openmetrics_data_model.proto - let metrics = prometheus_client::encoding::proto::encode(&self.registry); + let metrics = prometheus_client::encoding::protobuf::encode(&self.registry).unwrap(); let elapsed = chrono::Duration::from_std(self.local_start_time.elapsed()) .expect("Durations are small"); diff --git a/eth_consensus/simulation/src/network/run.rs b/eth_consensus/simulation/src/network/run.rs index ee36c19..370078b 100644 --- a/eth_consensus/simulation/src/network/run.rs +++ b/eth_consensus/simulation/src/network/run.rs @@ -17,14 +17,14 @@ use libp2p::identity::Keypair; use libp2p::mplex::MplexConfig; use libp2p::noise::NoiseConfig; use libp2p::swarm::{SwarmBuilder, SwarmEvent}; -use libp2p::tcp::{GenTcpConfig, TokioTcpTransport}; +use libp2p::tcp::tokio::Transport as TcpTransport; +use libp2p::tcp::Config as TcpConfig; use libp2p::yamux::YamuxConfig; use libp2p::PeerId; use libp2p::Transport; use npg::slot_generator::{Subnet, ValId}; use npg::Generator; use npg::Message; -use prometheus_client::encoding::proto::EncodeMetric; use prometheus_client::registry::Registry; use sha2::{Digest, Sha256}; use std::collections::{HashMap, HashSet}; @@ -90,7 +90,7 @@ pub(crate) fn parse_params( } // Sets up the gossipsub configuration to be used in the simulation. -pub fn setup_gossipsub(registry: &mut Registry>) -> Gossipsub { +pub fn setup_gossipsub(registry: &mut Registry) -> Gossipsub { let gossip_message_id = move |message: &GossipsubMessage| { MessageId::from( &Sha256::digest([message.topic.as_str().as_bytes(), &message.data].concat())[..20], @@ -171,7 +171,7 @@ pub(crate) async fn run( ) .await?; - let registry: Registry> = Registry::default(); + let registry = Registry::default(); let mut network = Network::new( registry, keypair, @@ -216,10 +216,8 @@ pub(crate) async fn run( pub fn build_transport( keypair: &Keypair, ) -> libp2p::core::transport::Boxed<(PeerId, StreamMuxerBox)> { - let transport = TokioDnsConfig::system(TokioTcpTransport::new( - GenTcpConfig::default().nodelay(true), - )) - .expect("DNS config"); + let transport = TokioDnsConfig::system(TcpTransport::new(TcpConfig::default().nodelay(true))) + .expect("DNS config"); let noise_keys = libp2p::noise::Keypair::::new() .into_authentic(keypair) @@ -240,7 +238,7 @@ impl Network { // Sets up initial conditions and configuration #[allow(clippy::too_many_arguments)] pub(crate) fn new( - mut registry: Registry>, + mut registry: Registry, keypair: Keypair, node_id: usize, instance_info: InstanceInfo, @@ -251,14 +249,11 @@ impl Network { ) -> Self { let gossipsub = setup_gossipsub(&mut registry); - let swarm = SwarmBuilder::new( + let swarm = SwarmBuilder::with_tokio_executor( build_transport(&keypair), gossipsub, PeerId::from(keypair.public()), ) - .executor(Box::new(|future| { - tokio::spawn(future); - })) .build(); info!( diff --git a/eth_consensus/simulation/src/utils.rs b/eth_consensus/simulation/src/utils.rs index 13e3c50..cbcf76e 100644 --- a/eth_consensus/simulation/src/utils.rs +++ b/eth_consensus/simulation/src/utils.rs @@ -2,12 +2,12 @@ use crate::InstanceInfo; use chrono::{DateTime, Local, Utc}; use libp2p::futures::StreamExt; use libp2p::PeerId; -use prometheus_client::encoding::proto::openmetrics_data_model::counter_value; -use prometheus_client::encoding::proto::openmetrics_data_model::gauge_value; -use prometheus_client::encoding::proto::openmetrics_data_model::metric_point; -use prometheus_client::encoding::proto::openmetrics_data_model::Metric; -use prometheus_client::encoding::proto::openmetrics_data_model::MetricFamily; -use prometheus_client::encoding::proto::HistogramValue; +use prometheus_client::encoding::protobuf::openmetrics_data_model::counter_value; +use prometheus_client::encoding::protobuf::openmetrics_data_model::gauge_value; +use prometheus_client::encoding::protobuf::openmetrics_data_model::metric_point; +use prometheus_client::encoding::protobuf::openmetrics_data_model::HistogramValue; +use prometheus_client::encoding::protobuf::openmetrics_data_model::Metric; +use prometheus_client::encoding::protobuf::openmetrics_data_model::MetricFamily; use serde::de::DeserializeOwned; use serde::Serialize; use std::borrow::Cow; From b028da5fcbdff9eab50900a535e7104217416821 Mon Sep 17 00:00:00 2001 From: ackintosh Date: Mon, 9 Jan 2023 14:43:54 +0900 Subject: [PATCH 04/10] cargo fmt --- scoring/src/attacker.rs | 6 ++---- scoring/src/beacon_node.rs | 12 +++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/scoring/src/attacker.rs b/scoring/src/attacker.rs index dc37e81..7c606cf 100644 --- a/scoring/src/attacker.rs +++ b/scoring/src/attacker.rs @@ -119,10 +119,8 @@ fn build_swarm(keypair: Keypair) -> Swarm { fn build_transport( keypair: &Keypair, ) -> libp2p_testground::core::transport::Boxed<(PeerId, StreamMuxerBox)> { - let transport = TokioDnsConfig::system(TcpTransport::new( - TcpConfig::default().nodelay(true), - )) - .expect("DNS config"); + let transport = TokioDnsConfig::system(TcpTransport::new(TcpConfig::default().nodelay(true))) + .expect("DNS config"); let noise_keys = libp2p_testground::noise::Keypair::::new() .into_authentic(keypair) diff --git a/scoring/src/beacon_node.rs b/scoring/src/beacon_node.rs index 5b15313..f5c8d0e 100644 --- a/scoring/src/beacon_node.rs +++ b/scoring/src/beacon_node.rs @@ -214,10 +214,8 @@ pub(crate) async fn run(client: Client) -> Result<(), Box /// Set up an encrypted TCP transport over the Mplex and Yamux protocols. fn build_transport(keypair: &Keypair) -> libp2p::core::transport::Boxed<(PeerId, StreamMuxerBox)> { - let transport = TokioDnsConfig::system(TcpTransport::new( - TcpConfig::default().nodelay(true), - )) - .expect("DNS config"); + let transport = TokioDnsConfig::system(TcpTransport::new(TcpConfig::default().nodelay(true))) + .expect("DNS config"); let noise_keys = libp2p::noise::Keypair::::new() .into_authentic(keypair) @@ -501,11 +499,7 @@ impl Network { Ok(()) } - async fn run_sim( - &mut self, - run_duration: Duration, - registry: &Registry, - ) { + async fn run_sim(&mut self, run_duration: Duration, registry: &Registry) { let deadline = tokio::time::sleep(run_duration); futures::pin_mut!(deadline); From 617f557c616e1e42395c4f037b5572b7acf4246b Mon Sep 17 00:00:00 2001 From: ackintosh Date: Wed, 22 Feb 2023 09:00:39 +0900 Subject: [PATCH 05/10] eth_consensus: Update libp2p and prometheus-client --- eth_consensus/Cargo.lock | 715 +++++++++++--------- eth_consensus/simulation/Cargo.toml | 11 +- eth_consensus/simulation/src/network.rs | 11 +- eth_consensus/simulation/src/network/run.rs | 14 +- 4 files changed, 417 insertions(+), 334 deletions(-) diff --git a/eth_consensus/Cargo.lock b/eth_consensus/Cargo.lock index ea94452..5448338 100644 --- a/eth_consensus/Cargo.lock +++ b/eth_consensus/Cargo.lock @@ -123,9 +123,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "arc-swap" @@ -158,7 +158,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.19", ] [[package]] @@ -174,7 +174,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.19", ] [[package]] @@ -235,7 +235,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -250,9 +250,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "autocfg" @@ -308,6 +308,12 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64ct" version = "1.5.3" @@ -343,9 +349,9 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ "digest 0.10.6", ] @@ -423,9 +429,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byte-slice-cast" @@ -441,9 +447,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" dependencies = [ "serde", ] @@ -464,9 +470,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.77" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "ccm" @@ -560,13 +566,13 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.29" +version = "4.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" dependencies = [ "bitflags", - "clap_derive 4.0.21", - "clap_lex 0.3.0", + "clap_derive 4.1.0", + "clap_lex 0.3.1", "is-terminal", "once_cell", "strsim", @@ -588,9 +594,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -610,9 +616,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] @@ -643,9 +649,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils", ] @@ -698,18 +704,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "crc" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" [[package]] name = "crossbeam-channel" @@ -835,22 +841,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.1" +version = "4.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms", "subtle", "zeroize", ] [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ "cc", "cxxbridge-flags", @@ -860,9 +867,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ "cc", "codespan-reporting", @@ -875,15 +882,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", @@ -902,12 +909,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" dependencies = [ - "darling_core 0.14.2", - "darling_macro 0.14.2", + "darling_core 0.14.3", + "darling_macro 0.14.3", ] [[package]] @@ -926,9 +933,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" dependencies = [ "fnv", "ident_case", @@ -951,20 +958,20 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" dependencies = [ - "darling_core 0.14.2", + "darling_core 0.14.3", "quote", "syn", ] [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "data-encoding-macro" @@ -1061,7 +1068,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" dependencies = [ - "darling 0.14.2", + "darling 0.14.3", "proc-macro2", "quote", "syn", @@ -1110,9 +1117,9 @@ dependencies = [ [[package]] name = "dtoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" [[package]] name = "ecdsa" @@ -1128,9 +1135,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -1151,9 +1158,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" @@ -1179,9 +1186,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -1340,9 +1347,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1357,6 +1364,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + [[package]] name = "fixed-hash" version = "0.7.0" @@ -1398,9 +1411,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -1413,9 +1426,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -1423,15 +1436,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -1441,9 +1454,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -1462,9 +1475,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -1478,21 +1491,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls 0.20.7", + "rustls 0.20.8", "webpki 0.22.0", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-timer" @@ -1502,9 +1515,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-channel", "futures-core", @@ -1531,7 +1544,7 @@ dependencies = [ name = "gen_topology_files" version = "0.1.0" dependencies = [ - "clap 4.0.29", + "clap 4.1.6", "gen_topology", "serde_json", ] @@ -1590,9 +1603,9 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "group" @@ -1620,7 +1633,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "tracing", ] @@ -1650,27 +1663,24 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hex" @@ -1735,9 +1745,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1769,9 +1779,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -1986,12 +1996,12 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2008,9 +2018,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "ipnetwork" @@ -2023,14 +2033,14 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2044,15 +2054,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -2065,14 +2075,20 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.138" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libm" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libp2p" version = "0.51.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", @@ -2101,7 +2117,7 @@ dependencies = [ [[package]] name = "libp2p-core" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asn1_der", "bs58", @@ -2135,7 +2151,7 @@ dependencies = [ [[package]] name = "libp2p-dns" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "libp2p-core", @@ -2148,7 +2164,7 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" version = "0.44.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", "base64 0.20.0", @@ -2161,7 +2177,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prometheus-client", + "prometheus-client 0.20.0", "prost", "prost-build", "prost-codec", @@ -2178,7 +2194,7 @@ dependencies = [ [[package]] name = "libp2p-kad" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "arrayvec", "asynchronous-codec", @@ -2206,7 +2222,7 @@ dependencies = [ [[package]] name = "libp2p-mdns" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "data-encoding", "futures", @@ -2225,18 +2241,18 @@ dependencies = [ [[package]] name = "libp2p-metrics" version = "0.12.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "libp2p-core", "libp2p-gossipsub", "libp2p-swarm", - "prometheus-client", + "prometheus-client 0.19.0", ] [[package]] name = "libp2p-mplex" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", "bytes", @@ -2253,7 +2269,7 @@ dependencies = [ [[package]] name = "libp2p-noise" version = "0.42.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "curve25519-dalek 3.2.0", @@ -2275,7 +2291,7 @@ dependencies = [ [[package]] name = "libp2p-quic" version = "0.7.0-alpha.2" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", @@ -2287,7 +2303,7 @@ dependencies = [ "parking_lot 0.12.1", "quinn-proto", "rand 0.8.5", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "tokio", ] @@ -2295,7 +2311,7 @@ dependencies = [ [[package]] name = "libp2p-swarm" version = "0.42.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "either", "fnv", @@ -2315,7 +2331,7 @@ dependencies = [ [[package]] name = "libp2p-tcp" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "futures-timer", @@ -2330,14 +2346,14 @@ dependencies = [ [[package]] name = "libp2p-tls" version = "0.1.0-alpha.2" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "futures-rustls", "libp2p-core", "rcgen 0.10.0", "ring", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "webpki 0.22.0", "x509-parser 0.14.0", @@ -2347,7 +2363,7 @@ dependencies = [ [[package]] name = "libp2p-webrtc" version = "0.4.0-alpha.2" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "async-trait", "asynchronous-codec", @@ -2370,14 +2386,14 @@ dependencies = [ "thiserror", "tinytemplate", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "webrtc", ] [[package]] name = "libp2p-yamux" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "libp2p-core", @@ -2409,9 +2425,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -2424,9 +2440,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lock_api" @@ -2479,9 +2495,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "md-5" @@ -2530,14 +2546,14 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2607,7 +2623,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" version = "0.12.1" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", @@ -2645,9 +2661,9 @@ dependencies = [ [[package]] name = "netlink-packet-utils" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" dependencies = [ "anyhow", "byteorder", @@ -2672,9 +2688,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b" dependencies = [ "bytes", "futures", @@ -2703,9 +2719,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -2714,7 +2730,7 @@ dependencies = [ [[package]] name = "npg" version = "0.1.0" -source = "git+https://github.com/sigp/eth-npg#6118cdd63eb34ffa4b230d17e88c8adf7057e138" +source = "git+https://github.com/sigp/eth-npg#5635351a0b94466893e52ef0709800238dbeaeea" dependencies = [ "futures", "rand 0.8.5", @@ -2765,11 +2781,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.2.6", "libc", ] @@ -2793,9 +2809,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -2837,6 +2853,16 @@ dependencies = [ "sha2 0.10.6", ] +[[package]] +name = "packed_simd_2" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm", +] + [[package]] name = "parity-scale-codec" version = "2.3.1" @@ -2877,7 +2903,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -2887,14 +2913,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.7", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -2906,28 +2932,28 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", ] @@ -2949,9 +2975,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", "indexmap", @@ -3005,18 +3031,24 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "polling" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg", "cfg-if", "libc", "log", "wepoll-ffi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3061,9 +3093,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", "syn", @@ -3118,9 +3150,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -3149,7 +3181,18 @@ dependencies = [ "dtoa", "itoa", "parking_lot 0.12.1", - "prometheus-client-derive-encode", + "prometheus-client-derive-encode 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "prometheus-client" +version = "0.20.0" +source = "git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels#f3cd73ae35a3b01537dfb1f5fbb1cdc8d5c5e77a" +dependencies = [ + "dtoa", + "itoa", + "parking_lot 0.12.1", + "prometheus-client-derive-encode 0.4.1 (git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels)", "prost", "prost-build", "prost-types", @@ -3166,11 +3209,21 @@ dependencies = [ "syn", ] +[[package]] +name = "prometheus-client-derive-encode" +version = "0.4.1" +source = "git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels#f3cd73ae35a3b01537dfb1f5fbb1cdc8d5c5e77a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -3178,9 +3231,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", "heck", @@ -3201,7 +3254,7 @@ dependencies = [ [[package]] name = "prost-codec" version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", "bytes", @@ -3212,9 +3265,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -3225,9 +3278,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -3255,7 +3308,7 @@ dependencies = [ "rand 0.8.5", "ring", "rustc-hash", - "rustls 0.20.7", + "rustls 0.20.8", "slab", "thiserror", "tinyvec", @@ -3265,9 +3318,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -3360,20 +3413,19 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -3389,7 +3441,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time 0.3.17", + "time 0.3.19", "x509-parser 0.13.2", "yasna", ] @@ -3402,7 +3454,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.17", + "time 0.3.19", "yasna", ] @@ -3417,9 +3469,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -3452,11 +3504,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -3617,16 +3669,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.4" +version = "0.36.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -3644,9 +3696,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -3656,14 +3708,14 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "pin-project", @@ -3672,9 +3724,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "safe_arith" @@ -3689,9 +3741,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "sct" @@ -3741,15 +3793,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] @@ -3765,9 +3817,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -3776,9 +3828,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ "itoa", "ryu", @@ -3787,9 +3839,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" dependencies = [ "proc-macro2", "quote", @@ -3820,12 +3872,12 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" +checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c" dependencies = [ "serde", - "serde_with_macros 2.1.0", + "serde_with_macros 2.2.0", ] [[package]] @@ -3842,11 +3894,11 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa" +checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" dependencies = [ - "darling 0.14.2", + "darling 0.14.3", "proc-macro2", "quote", "syn", @@ -3912,9 +3964,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -3939,23 +3991,23 @@ dependencies = [ "gen_topology", "libp2p", "npg", - "prometheus-client", + "prometheus-client 0.20.0", "rand 0.8.5", "serde", "serde_json", "sha2 0.10.6", "testground", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "tracing", "tracing-subscriber", ] [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -3985,14 +4037,14 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snow" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" +checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.1", + "curve25519-dalek 4.0.0-rc.0", "rand_core 0.6.4", "ring", "rustc_version", @@ -4134,9 +4186,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -4198,9 +4250,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -4229,12 +4281,12 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "serde_with 2.1.0", + "serde_with 2.2.0", "soketto", "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.7", ] [[package]] @@ -4245,18 +4297,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -4265,10 +4317,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -4294,9 +4347,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2" dependencies = [ "itoa", "serde", @@ -4312,9 +4365,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c" dependencies = [ "time-core", ] @@ -4349,15 +4402,15 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.22.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", @@ -4370,7 +4423,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -4386,9 +4439,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -4412,9 +4465,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -4428,9 +4481,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -4571,9 +4624,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "turn" @@ -4596,9 +4649,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "types" @@ -4659,15 +4712,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -4729,9 +4782,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "getrandom 0.2.8", ] @@ -4805,9 +4858,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4815,9 +4868,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -4830,9 +4883,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -4842,9 +4895,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4852,9 +4905,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -4865,9 +4918,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-timer" @@ -4886,9 +4939,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -4940,7 +4993,7 @@ dependencies = [ "sha2 0.10.6", "stun", "thiserror", - "time 0.3.17", + "time 0.3.19", "tokio", "turn", "url", @@ -5013,9 +5066,9 @@ dependencies = [ [[package]] name = "webrtc-ice" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7" +checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" dependencies = [ "arc-swap", "async-trait", @@ -5137,9 +5190,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -5203,19 +5256,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" @@ -5225,9 +5302,9 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" @@ -5237,9 +5314,9 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" @@ -5249,9 +5326,9 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" @@ -5261,15 +5338,15 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" @@ -5279,9 +5356,9 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" @@ -5336,7 +5413,7 @@ dependencies = [ "ring", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.19", ] [[package]] @@ -5354,7 +5431,7 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.19", ] [[package]] @@ -5386,7 +5463,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" dependencies = [ - "time 0.3.17", + "time 0.3.19", ] [[package]] diff --git a/eth_consensus/simulation/Cargo.toml b/eth_consensus/simulation/Cargo.toml index 6f05acd..8b40c36 100644 --- a/eth_consensus/simulation/Cargo.toml +++ b/eth_consensus/simulation/Cargo.toml @@ -9,9 +9,12 @@ edition = "2021" chrono = { version = "0.4.19", features = [ "std" ]} delay_map = "0.1.1" -prometheus-client = { version = "0.19.0", features = ["protobuf"] } -# TODO: update libp2p once the next version has been released. -libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", rev = "26215286391cc277270d6bbc88d3b2fc0de54c7d", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } +# TODO: Update prometheus-client once the next version, which includes the fix, has been released. +# See https://github.com/prometheus/client_rust/pull/123 +prometheus-client = { git = "https://github.com/ackintosh/client_rust.git", branch = "fix/protobuf-labels", features = ["protobuf"] } +# TODO: Update libp2p once the next version, which includes prometheus-client v0.20, has been released. +# See https://github.com/ackintosh/rust-libp2p/commit/df09870c8c2294cbaeb881f58d4f9752125562bc +libp2p = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "prometheus-client-0.20.0", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } serde_json = "1.0" serde = "1.0" testground = "0.4.0" @@ -22,5 +25,5 @@ gen_topology = { path = "../utils/gen_topology" } futures = "0.3.24" npg = { git = "https://github.com/sigp/eth-npg"} sha2 = "0.10.6" -rand = "0.8.5" +rand = { version = "0.8.5", features = ["small_rng"] } tokio-util = { version = "0.7.4", features = ["time"] } diff --git a/eth_consensus/simulation/src/network.rs b/eth_consensus/simulation/src/network.rs index eab4abb..ab95912 100644 --- a/eth_consensus/simulation/src/network.rs +++ b/eth_consensus/simulation/src/network.rs @@ -2,8 +2,7 @@ use crate::InstanceInfo; use chrono::{DateTime, Utc}; use futures::stream::FuturesUnordered; use libp2p::gossipsub::{ - error::GossipsubHandlerError, Gossipsub, GossipsubEvent, IdentTopic, MessageId, - Topic as GossipTopic, + Behaviour, Event, HandlerError, IdentTopic, MessageId, Topic as GossipTopic, }; use libp2p::swarm::SwarmEvent; use libp2p::PeerId; @@ -29,7 +28,7 @@ use run::{ATTESTATION_SUBNETS, SYNC_SUBNETS}; /// Main struct to run the simulation. pub struct Network { /// Libp2p2 swarm. - swarm: Swarm, + swarm: Swarm, /// Node id for this node, local to the test run. node_id: usize, /// This nodes contact info. @@ -119,7 +118,7 @@ impl Network { topic: Topic, validator: u64, mut payload: Vec, - ) -> Result { + ) -> Result { // Plain binary as messages, coupled with the validator payload.append(&mut validator.to_be_bytes().to_vec()); @@ -136,9 +135,9 @@ impl Network { } // An inbound event or swarm event gets sent here - fn handle_swarm_event(&mut self, event: SwarmEvent) { + fn handle_swarm_event(&mut self, event: SwarmEvent) { match event { - SwarmEvent::Behaviour(GossipsubEvent::Message { + SwarmEvent::Behaviour(Event::Message { propagation_source, message_id, message, diff --git a/eth_consensus/simulation/src/network/run.rs b/eth_consensus/simulation/src/network/run.rs index 370078b..68b617e 100644 --- a/eth_consensus/simulation/src/network/run.rs +++ b/eth_consensus/simulation/src/network/run.rs @@ -10,7 +10,7 @@ use libp2p::futures::StreamExt; use libp2p::gossipsub::metrics::Config; use libp2p::gossipsub::subscription_filter::AllowAllSubscriptionFilter; use libp2p::gossipsub::{ - Gossipsub, GossipsubConfigBuilder, GossipsubMessage, IdentityTransform, MessageAuthenticity, + Behaviour, ConfigBuilder, IdentityTransform, Message as GossipsubMessage, MessageAuthenticity, MessageId, PeerScoreParams, PeerScoreThresholds, ValidationMode, }; use libp2p::identity::Keypair; @@ -26,6 +26,8 @@ use npg::slot_generator::{Subnet, ValId}; use npg::Generator; use npg::Message; use prometheus_client::registry::Registry; +use rand::rngs::SmallRng; +use rand::SeedableRng; use sha2::{Digest, Sha256}; use std::collections::{HashMap, HashSet}; use std::sync::Arc; @@ -90,14 +92,14 @@ pub(crate) fn parse_params( } // Sets up the gossipsub configuration to be used in the simulation. -pub fn setup_gossipsub(registry: &mut Registry) -> Gossipsub { +pub fn setup_gossipsub(registry: &mut Registry) -> Behaviour { let gossip_message_id = move |message: &GossipsubMessage| { MessageId::from( &Sha256::digest([message.topic.as_str().as_bytes(), &message.data].concat())[..20], ) }; - let gossipsub_config = GossipsubConfigBuilder::default() + let gossipsub_config = ConfigBuilder::default() .max_transmit_size(10 * 1_048_576) // gossip_max_size(true) // .heartbeat_interval(Duration::from_secs(1)) .prune_backoff(Duration::from_secs(60)) @@ -117,7 +119,7 @@ pub fn setup_gossipsub(registry: &mut Registry) -> Gossipsub { .build() .expect("valid gossipsub configuration"); - let mut gs = Gossipsub::new_with_subscription_filter_and_transform( + let mut gs = Behaviour::new_with_subscription_filter_and_transform( MessageAuthenticity::Anonymous, gossipsub_config, Some((registry, Config::default())), @@ -329,6 +331,8 @@ impl Network { self.record_metrics_info(), ))); + let mut small_rng = SmallRng::from_entropy(); + loop { tokio::select! { _ = deadline.as_mut() => { @@ -336,7 +340,7 @@ impl Network { break; } Some(m) = self.messages_gen.next() => { - let payload = m.payload(); + let payload = m.payload(&mut small_rng); let (topic, val) = match m { Message::BeaconBlock { proposer: ValId(v), slot: _ } => { (Topic::Blocks, v) From c5fafdfc30c4bb9a20faed9287154ed633fa3440 Mon Sep 17 00:00:00 2001 From: ackintosh Date: Thu, 23 Feb 2023 06:49:59 +0900 Subject: [PATCH 06/10] censoring: Update libp2p and prometheus-client --- censoring/Cargo.lock | 574 ++++++++++++++++++++++------------------ censoring/Cargo.toml | 9 +- censoring/src/honest.rs | 8 +- 3 files changed, 323 insertions(+), 268 deletions(-) diff --git a/censoring/Cargo.lock b/censoring/Cargo.lock index 2d5f9f1..4da93a7 100644 --- a/censoring/Cargo.lock +++ b/censoring/Cargo.lock @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "arc-swap" @@ -224,7 +224,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -239,9 +239,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.60" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -263,9 +263,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "autocfg" @@ -297,6 +297,12 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64ct" version = "1.5.3" @@ -369,9 +375,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -381,18 +387,18 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "ccm" @@ -411,9 +417,9 @@ version = "0.1.0" dependencies = [ "chrono", "delay_map", - "libp2p 0.51.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p 0.51.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "libp2p 0.51.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", - "prometheus-client", + "prometheus-client 0.20.0", "prost", "rand 0.8.5", "serde", @@ -534,9 +540,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils", ] @@ -589,18 +595,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "crc" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" [[package]] name = "crossbeam-utils" @@ -692,9 +698,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.5" +version = "4.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f" +checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac" dependencies = [ "cfg-if", "fiat-crypto", @@ -706,9 +712,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.85" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ "cc", "cxxbridge-flags", @@ -718,9 +724,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.85" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ "cc", "codespan-reporting", @@ -733,15 +739,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.85" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] name = "cxxbridge-macro" -version = "1.0.85" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", @@ -750,9 +756,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" dependencies = [ "darling_core", "darling_macro", @@ -760,9 +766,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" dependencies = [ "fnv", "ident_case", @@ -774,9 +780,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" dependencies = [ "darling_core", "quote", @@ -940,9 +946,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -963,9 +969,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" @@ -991,9 +997,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -1018,9 +1024,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1064,9 +1070,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -1079,9 +1085,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -1089,15 +1095,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -1107,9 +1113,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -1128,9 +1134,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -1144,21 +1150,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls 0.20.7", + "rustls 0.20.8", "webpki 0.22.0", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-timer" @@ -1168,9 +1174,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-channel", "futures-core", @@ -1262,7 +1268,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "tracing", ] @@ -1274,9 +1280,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1350,9 +1356,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1384,9 +1390,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -1567,9 +1573,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "ipnetwork" @@ -1597,9 +1603,9 @@ checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -1625,26 +1631,26 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libp2p" version = "0.51.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-dns 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-gossipsub 0.44.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-kad 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-mdns 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-metrics 0.12.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-mplex 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-noise 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-quic 0.7.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-tcp 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-webrtc 0.4.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-yamux 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-dns 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-kad 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-mdns 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-metrics 0.12.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-mplex 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-noise 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-quic 0.7.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-tcp 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-webrtc 0.4.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-yamux 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "multiaddr", "parking_lot 0.12.1", "pin-project", @@ -1683,7 +1689,7 @@ dependencies = [ [[package]] name = "libp2p-core" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asn1_der", "bs58", @@ -1696,14 +1702,14 @@ dependencies = [ "log", "multiaddr", "multihash", - "multistream-select 0.12.1 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "multistream-select 0.12.1 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", - "rw-stream-sink 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "rw-stream-sink 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "sec1", "serde", "sha2 0.10.6", @@ -1751,10 +1757,10 @@ dependencies = [ [[package]] name = "libp2p-dns" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "parking_lot 0.12.1", "smallvec", @@ -1777,7 +1783,7 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" version = "0.44.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", "base64 0.20.0", @@ -1787,13 +1793,13 @@ dependencies = [ "futures", "hex_fmt", "instant", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", - "prometheus-client", + "prometheus-client 0.20.0", "prost", "prost-build", - "prost-codec 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "rand 0.8.5", "regex", "serde", @@ -1820,7 +1826,7 @@ dependencies = [ "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "prometheus-client", + "prometheus-client 0.19.0", "prost", "prost-build", "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", @@ -1837,7 +1843,7 @@ dependencies = [ [[package]] name = "libp2p-kad" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "arrayvec", "asynchronous-codec", @@ -1847,8 +1853,8 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "prost", "prost-build", @@ -1893,13 +1899,13 @@ dependencies = [ [[package]] name = "libp2p-mdns" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "data-encoding", "futures", "if-watch", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "rand 0.8.5", "smallvec", @@ -1931,12 +1937,12 @@ dependencies = [ [[package]] name = "libp2p-metrics" version = "0.12.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-gossipsub 0.44.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "prometheus-client", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "prometheus-client 0.19.0", ] [[package]] @@ -1947,18 +1953,18 @@ dependencies = [ "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", - "prometheus-client", + "prometheus-client 0.19.0", ] [[package]] name = "libp2p-mplex" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -1987,12 +1993,12 @@ dependencies = [ [[package]] name = "libp2p-noise" version = "0.42.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "once_cell", "prost", @@ -2031,19 +2037,19 @@ dependencies = [ [[package]] name = "libp2p-quic" version = "0.7.0-alpha.2" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", "futures-timer", "if-watch", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-tls 0.1.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-tls 0.1.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "parking_lot 0.12.1", "quinn-proto", "rand 0.8.5", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "tokio", ] @@ -2063,7 +2069,7 @@ dependencies = [ "parking_lot 0.12.1", "quinn-proto", "rand 0.8.5", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "tokio", ] @@ -2071,14 +2077,14 @@ dependencies = [ [[package]] name = "libp2p-swarm" version = "0.42.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "pin-project", "rand 0.8.5", @@ -2111,13 +2117,13 @@ dependencies = [ [[package]] name = "libp2p-tcp" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "futures-timer", "if-watch", "libc", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "socket2", "tokio", @@ -2141,14 +2147,14 @@ dependencies = [ [[package]] name = "libp2p-tls" version = "0.1.0-alpha.2" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "futures-rustls", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "rcgen 0.10.0", "ring", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "webpki 0.22.0", "x509-parser 0.14.0", @@ -2165,7 +2171,7 @@ dependencies = [ "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "rcgen 0.10.0", "ring", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "webpki 0.22.0", "x509-parser 0.14.0", @@ -2175,7 +2181,7 @@ dependencies = [ [[package]] name = "libp2p-webrtc" version = "0.4.0-alpha.2" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "async-trait", "asynchronous-codec", @@ -2184,13 +2190,13 @@ dependencies = [ "futures-timer", "hex", "if-watch", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-noise 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-noise 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "multihash", "prost", "prost-build", - "prost-codec 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "rand 0.8.5", "rcgen 0.9.3", "serde", @@ -2198,7 +2204,7 @@ dependencies = [ "thiserror", "tinytemplate", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "webrtc", ] @@ -2228,17 +2234,17 @@ dependencies = [ "thiserror", "tinytemplate", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "webrtc", ] [[package]] name = "libp2p-yamux" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "parking_lot 0.12.1", "thiserror", @@ -2318,9 +2324,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "md-5" @@ -2360,14 +2366,14 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2437,7 +2443,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" version = "0.12.1" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", @@ -2488,9 +2494,9 @@ dependencies = [ [[package]] name = "netlink-packet-utils" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" dependencies = [ "anyhow", "byteorder", @@ -2515,9 +2521,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b" dependencies = [ "bytes", "futures", @@ -2546,9 +2552,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -2624,9 +2630,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -2702,7 +2708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.7", ] [[package]] @@ -2721,15 +2727,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2740,9 +2746,9 @@ checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", ] @@ -2764,9 +2770,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", "indexmap", @@ -2831,7 +2837,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -2876,9 +2882,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8992a85d8e93a28bdf76137db888d3874e3b230dee5ed8bebac4c9f7617773" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", "syn", @@ -2920,9 +2926,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -2936,7 +2942,18 @@ dependencies = [ "dtoa", "itoa", "parking_lot 0.12.1", - "prometheus-client-derive-encode", + "prometheus-client-derive-encode 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "prometheus-client" +version = "0.20.0" +source = "git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels#f3cd73ae35a3b01537dfb1f5fbb1cdc8d5c5e77a" +dependencies = [ + "dtoa", + "itoa", + "parking_lot 0.12.1", + "prometheus-client-derive-encode 0.4.1 (git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels)", "prost", "prost-build", "prost-types", @@ -2944,9 +2961,19 @@ dependencies = [ [[package]] name = "prometheus-client-derive-encode" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954bf540143bc26dc3a12363b6cc164eb4e208eaa2228f68558ca846ff57e6e2" +checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prometheus-client-derive-encode" +version = "0.4.1" +source = "git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels#f3cd73ae35a3b01537dfb1f5fbb1cdc8d5c5e77a" dependencies = [ "proc-macro2", "quote", @@ -2955,9 +2982,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -2965,9 +2992,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5320c680de74ba083512704acb90fe00f28f79207286a848e730c45dd73ed6" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", "heck", @@ -2988,7 +3015,7 @@ dependencies = [ [[package]] name = "prost-codec" version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", "bytes", @@ -3011,9 +3038,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -3024,9 +3051,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017f79637768cde62820bc2d4fe0e45daaa027755c323ad077767c6c5f173091" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -3048,7 +3075,7 @@ dependencies = [ "rand 0.8.5", "ring", "rustc-hash", - "rustls 0.20.7", + "rustls 0.20.8", "slab", "thiserror", "tinyvec", @@ -3172,9 +3199,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -3207,11 +3234,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -3354,9 +3381,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -3367,7 +3394,7 @@ dependencies = [ [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "pin-project", @@ -3485,9 +3512,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ "itoa", "ryu", @@ -3519,9 +3546,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" +checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c" dependencies = [ "serde", "serde_with_macros", @@ -3529,9 +3556,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa" +checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" dependencies = [ "darling", "proc-macro2", @@ -3587,9 +3614,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -3606,9 +3633,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -3621,14 +3648,14 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snow" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" +checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.5", + "curve25519-dalek 4.0.0-rc.0", "rand_core 0.6.4", "ring", "rustc_version", @@ -3783,9 +3810,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -3810,7 +3837,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.7", ] [[package]] @@ -3841,18 +3868,19 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] [[package]] name = "time" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2" dependencies = [ "itoa", "serde", @@ -3868,9 +3896,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c" dependencies = [ "time-core", ] @@ -3896,15 +3924,15 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.23.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", @@ -3917,7 +3945,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3933,9 +3961,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -3959,9 +3987,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -3974,9 +4002,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -4097,9 +4125,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "turn" @@ -4140,9 +4168,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" @@ -4210,9 +4238,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "getrandom 0.2.8", ] @@ -4274,9 +4302,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4284,9 +4312,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -4299,9 +4327,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -4311,9 +4339,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4321,9 +4349,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -4334,9 +4362,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-timer" @@ -4355,9 +4383,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -4482,9 +4510,9 @@ dependencies = [ [[package]] name = "webrtc-ice" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7" +checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" dependencies = [ "arc-swap", "async-trait", @@ -4606,9 +4634,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -4672,19 +4700,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" @@ -4694,9 +4746,9 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" @@ -4706,9 +4758,9 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" @@ -4718,9 +4770,9 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" @@ -4730,15 +4782,15 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" @@ -4748,9 +4800,9 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" diff --git a/censoring/Cargo.toml b/censoring/Cargo.toml index 32d3226..36578c4 100644 --- a/censoring/Cargo.toml +++ b/censoring/Cargo.toml @@ -9,8 +9,9 @@ edition = "2021" chrono = { version = "0.4.19", default-features = false, features = ["clock"] } delay_map = "0.1.1" -# TODO: update libp2p once the next version has been released. -libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", rev = "26215286391cc277270d6bbc88d3b2fc0de54c7d", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } +# TODO: Update libp2p once the next version, which includes prometheus-client v0.20, has been released. +# See https://github.com/ackintosh/rust-libp2p/commit/df09870c8c2294cbaeb881f58d4f9752125562bc +libp2p = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "prometheus-client-0.20.0", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } # This is a fork of `libp2p` in order to implement malicious behaviour in the `attacker` module. # This `libp2p-testground` is used in `attacker` module instead of `libp2p`. @@ -25,6 +26,8 @@ tokio = { version = "1.20.0", features = ["macros"] } tracing = "0.1.35" tracing-subscriber = { version = "0.3.14", features = ["env-filter"] } -prometheus-client = { version = "0.19.0", features = ["protobuf"] } +# TODO: Update prometheus-client once the next version, which includes the fix, has been released. +# See https://github.com/prometheus/client_rust/pull/123 +prometheus-client = { git = "https://github.com/ackintosh/client_rust.git", branch = "fix/protobuf-labels", features = ["protobuf"] } prost = "0.11" diff --git a/censoring/src/honest.rs b/censoring/src/honest.rs index fd995f9..2e4c84c 100644 --- a/censoring/src/honest.rs +++ b/censoring/src/honest.rs @@ -11,7 +11,7 @@ use libp2p::futures::StreamExt; use libp2p::gossipsub::metrics::Config; use libp2p::gossipsub::subscription_filter::AllowAllSubscriptionFilter; use libp2p::gossipsub::{ - Gossipsub, GossipsubConfigBuilder, IdentTopic, IdentityTransform, MessageAuthenticity, + Behaviour, ConfigBuilder, IdentTopic, IdentityTransform, MessageAuthenticity, PeerScoreParams, PeerScoreThresholds, Topic, TopicScoreParams, }; use libp2p::identity::Keypair; @@ -281,7 +281,7 @@ enum PublishState { } pub(crate) struct HonestNetwork { - swarm: Swarm, + swarm: Swarm, instance_info: InstanceInfo, participants: HashMap, client: Client, @@ -305,13 +305,13 @@ impl HonestNetwork { recv: UnboundedReceiver, ) -> Self { let gossipsub = { - let gossipsub_config = GossipsubConfigBuilder::default() + let gossipsub_config = ConfigBuilder::default() .prune_backoff(Duration::from_secs(PRUNE_BACKOFF)) .history_length(12) .build() .expect("Valid configuration"); - let mut gs = Gossipsub::new_with_subscription_filter_and_transform( + let mut gs = Behaviour::new_with_subscription_filter_and_transform( MessageAuthenticity::Signed(keypair.clone()), gossipsub_config, Some((registry, Config::default())), From b56b9e440b747eaa08af6bccad7ad7cbf29a35a1 Mon Sep 17 00:00:00 2001 From: ackintosh Date: Thu, 23 Feb 2023 07:04:42 +0900 Subject: [PATCH 07/10] scoring: Update libp2p and prometheus-client --- scoring/Cargo.lock | 730 ++++++++++++++++++++----------------- scoring/Cargo.toml | 13 +- scoring/src/beacon_node.rs | 21 +- 3 files changed, 425 insertions(+), 339 deletions(-) diff --git a/scoring/Cargo.lock b/scoring/Cargo.lock index 2516831..eae44ed 100644 --- a/scoring/Cargo.lock +++ b/scoring/Cargo.lock @@ -123,9 +123,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "arc-swap" @@ -235,7 +235,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -250,9 +250,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "autocfg" @@ -308,6 +308,12 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64ct" version = "1.5.3" @@ -343,9 +349,9 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ "digest 0.10.6", ] @@ -423,9 +429,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byte-slice-cast" @@ -441,9 +447,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" dependencies = [ "serde", ] @@ -464,9 +470,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.77" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "ccm" @@ -603,9 +609,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils", ] @@ -658,18 +664,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "crc" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" [[package]] name = "crossbeam-channel" @@ -795,22 +801,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.1" +version = "4.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms", "subtle", "zeroize", ] [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ "cc", "cxxbridge-flags", @@ -820,9 +827,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ "cc", "codespan-reporting", @@ -835,15 +842,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", @@ -862,12 +869,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" dependencies = [ - "darling_core 0.14.2", - "darling_macro 0.14.2", + "darling_core 0.14.3", + "darling_macro 0.14.3", ] [[package]] @@ -886,9 +893,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" dependencies = [ "fnv", "ident_case", @@ -911,20 +918,20 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" dependencies = [ - "darling_core 0.14.2", + "darling_core 0.14.3", "quote", "syn", ] [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "data-encoding-macro" @@ -1021,7 +1028,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" dependencies = [ - "darling 0.14.2", + "darling 0.14.3", "proc-macro2", "quote", "syn", @@ -1070,9 +1077,9 @@ dependencies = [ [[package]] name = "dtoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" [[package]] name = "ecdsa" @@ -1088,9 +1095,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -1111,9 +1118,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" @@ -1139,9 +1146,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -1279,9 +1286,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1296,6 +1303,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + [[package]] name = "fixed-hash" version = "0.7.0" @@ -1337,9 +1350,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -1352,9 +1365,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -1362,15 +1375,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -1380,9 +1393,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -1401,9 +1414,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -1417,21 +1430,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls 0.20.7", + "rustls 0.20.8", "webpki 0.22.0", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-timer" @@ -1441,9 +1454,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-channel", "futures-core", @@ -1521,9 +1534,9 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "group" @@ -1551,7 +1564,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "tracing", ] @@ -1581,15 +1594,15 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] @@ -1657,9 +1670,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1691,9 +1704,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -1920,9 +1933,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "ipnetwork" @@ -1944,15 +1957,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -1965,33 +1978,39 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.138" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libp2p" version = "0.51.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-dns 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-gossipsub 0.44.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-kad 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-mdns 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-metrics 0.12.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-mplex 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-noise 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-quic 0.7.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-tcp 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-webrtc 0.4.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-yamux 0.43.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-dns 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-kad 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-mdns 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-metrics 0.12.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-mplex 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-noise 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-quic 0.7.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-tcp 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-webrtc 0.4.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-yamux 0.43.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "multiaddr", "parking_lot 0.12.1", "pin-project", @@ -2030,7 +2049,7 @@ dependencies = [ [[package]] name = "libp2p-core" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asn1_der", "bs58", @@ -2043,14 +2062,14 @@ dependencies = [ "log", "multiaddr", "multihash", - "multistream-select 0.12.1 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "multistream-select 0.12.1 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", - "rw-stream-sink 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "rw-stream-sink 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "sec1", "serde", "sha2 0.10.6", @@ -2098,10 +2117,10 @@ dependencies = [ [[package]] name = "libp2p-dns" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "parking_lot 0.12.1", "smallvec", @@ -2124,7 +2143,7 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" version = "0.44.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", "base64 0.20.0", @@ -2134,13 +2153,13 @@ dependencies = [ "futures", "hex_fmt", "instant", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", - "prometheus-client", + "prometheus-client 0.20.0", "prost", "prost-build", - "prost-codec 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "rand 0.8.5", "regex", "serde", @@ -2167,7 +2186,7 @@ dependencies = [ "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "log", - "prometheus-client", + "prometheus-client 0.19.0", "prost", "prost-build", "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", @@ -2184,7 +2203,7 @@ dependencies = [ [[package]] name = "libp2p-kad" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "arrayvec", "asynchronous-codec", @@ -2194,8 +2213,8 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "prost", "prost-build", @@ -2240,13 +2259,13 @@ dependencies = [ [[package]] name = "libp2p-mdns" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "data-encoding", "futures", "if-watch", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "rand 0.8.5", "smallvec", @@ -2278,12 +2297,12 @@ dependencies = [ [[package]] name = "libp2p-metrics" version = "0.12.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-gossipsub 0.44.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-swarm 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "prometheus-client", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "prometheus-client 0.19.0", ] [[package]] @@ -2294,18 +2313,18 @@ dependencies = [ "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "libp2p-gossipsub 0.44.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "libp2p-swarm 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", - "prometheus-client", + "prometheus-client 0.19.0", ] [[package]] name = "libp2p-mplex" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -2334,12 +2353,12 @@ dependencies = [ [[package]] name = "libp2p-noise" version = "0.42.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "once_cell", "prost", @@ -2378,19 +2397,19 @@ dependencies = [ [[package]] name = "libp2p-quic" version = "0.7.0-alpha.2" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", "futures-timer", "if-watch", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-tls 0.1.0-alpha.2 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-tls 0.1.0-alpha.2 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "parking_lot 0.12.1", "quinn-proto", "rand 0.8.5", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "tokio", ] @@ -2410,7 +2429,7 @@ dependencies = [ "parking_lot 0.12.1", "quinn-proto", "rand 0.8.5", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "tokio", ] @@ -2418,14 +2437,14 @@ dependencies = [ [[package]] name = "libp2p-swarm" version = "0.42.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "pin-project", "rand 0.8.5", @@ -2458,13 +2477,13 @@ dependencies = [ [[package]] name = "libp2p-tcp" version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "futures-timer", "if-watch", "libc", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "socket2", "tokio", @@ -2488,14 +2507,14 @@ dependencies = [ [[package]] name = "libp2p-tls" version = "0.1.0-alpha.2" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "futures-rustls", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "rcgen 0.10.0", "ring", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "webpki 0.22.0", "x509-parser 0.14.0", @@ -2512,7 +2531,7 @@ dependencies = [ "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "rcgen 0.10.0", "ring", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "webpki 0.22.0", "x509-parser 0.14.0", @@ -2522,7 +2541,7 @@ dependencies = [ [[package]] name = "libp2p-webrtc" version = "0.4.0-alpha.2" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "async-trait", "asynchronous-codec", @@ -2531,13 +2550,13 @@ dependencies = [ "futures-timer", "hex", "if-watch", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", - "libp2p-noise 0.42.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", + "libp2p-noise 0.42.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "multihash", "prost", "prost-build", - "prost-codec 0.3.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "prost-codec 0.3.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "rand 0.8.5", "rcgen 0.9.3", "serde", @@ -2545,7 +2564,7 @@ dependencies = [ "thiserror", "tinytemplate", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "webrtc", ] @@ -2575,17 +2594,17 @@ dependencies = [ "thiserror", "tinytemplate", "tokio", - "tokio-util 0.7.4", + "tokio-util 0.7.7", "webrtc", ] [[package]] name = "libp2p-yamux" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", - "libp2p-core 0.39.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p-core 0.39.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "log", "parking_lot 0.12.1", "thiserror", @@ -2627,9 +2646,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -2691,9 +2710,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "md-5" @@ -2742,14 +2761,14 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2819,7 +2838,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" version = "0.12.1" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", @@ -2870,9 +2889,9 @@ dependencies = [ [[package]] name = "netlink-packet-utils" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" dependencies = [ "anyhow", "byteorder", @@ -2897,9 +2916,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b" dependencies = [ "bytes", "futures", @@ -2928,9 +2947,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -2990,9 +3009,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ "hermit-abi", "libc", @@ -3018,9 +3037,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -3062,6 +3081,16 @@ dependencies = [ "sha2 0.10.6", ] +[[package]] +name = "packed_simd_2" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm", +] + [[package]] name = "parity-scale-codec" version = "2.3.1" @@ -3102,7 +3131,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -3112,14 +3141,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.7", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -3131,28 +3160,28 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", ] @@ -3174,9 +3203,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", "indexmap", @@ -3230,18 +3259,24 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "polling" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg", "cfg-if", "libc", "log", "wepoll-ffi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3286,9 +3321,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", "syn", @@ -3343,9 +3378,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -3374,7 +3409,18 @@ dependencies = [ "dtoa", "itoa", "parking_lot 0.12.1", - "prometheus-client-derive-encode", + "prometheus-client-derive-encode 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "prometheus-client" +version = "0.20.0" +source = "git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels#f3cd73ae35a3b01537dfb1f5fbb1cdc8d5c5e77a" +dependencies = [ + "dtoa", + "itoa", + "parking_lot 0.12.1", + "prometheus-client-derive-encode 0.4.1 (git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels)", "prost", "prost-build", "prost-types", @@ -3391,11 +3437,21 @@ dependencies = [ "syn", ] +[[package]] +name = "prometheus-client-derive-encode" +version = "0.4.1" +source = "git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels#f3cd73ae35a3b01537dfb1f5fbb1cdc8d5c5e77a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -3403,9 +3459,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", "heck", @@ -3426,7 +3482,7 @@ dependencies = [ [[package]] name = "prost-codec" version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", "bytes", @@ -3449,9 +3505,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -3462,9 +3518,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -3492,7 +3548,7 @@ dependencies = [ "rand 0.8.5", "ring", "rustc-hash", - "rustls 0.20.7", + "rustls 0.20.8", "slab", "thiserror", "tinyvec", @@ -3502,9 +3558,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -3597,20 +3653,19 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -3654,9 +3709,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -3689,11 +3744,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -3867,9 +3922,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -3879,14 +3934,14 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d#26215286391cc277270d6bbc88d3b2fc0de54c7d" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "pin-project", @@ -3905,9 +3960,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "safe_arith" @@ -3928,10 +3983,10 @@ dependencies = [ "delay_map", "futures", "gen_topology", - "libp2p 0.51.0 (git+https://github.com/libp2p/rust-libp2p.git?rev=26215286391cc277270d6bbc88d3b2fc0de54c7d)", + "libp2p 0.51.0 (git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0)", "libp2p 0.51.0 (git+https://github.com/ackintosh/rust-libp2p.git?rev=8e8be3f465cb9815fd84184c32805541db546aa7)", "npg", - "prometheus-client", + "prometheus-client 0.20.0", "prost", "rand 0.8.5", "serde", @@ -3947,9 +4002,9 @@ dependencies = [ [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "sct" @@ -3999,15 +4054,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] @@ -4023,9 +4078,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -4034,9 +4089,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ "itoa", "ryu", @@ -4045,9 +4100,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" dependencies = [ "proc-macro2", "quote", @@ -4078,12 +4133,12 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" +checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c" dependencies = [ "serde", - "serde_with_macros 2.1.0", + "serde_with_macros 2.2.0", ] [[package]] @@ -4100,11 +4155,11 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa" +checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" dependencies = [ - "darling 0.14.2", + "darling 0.14.3", "proc-macro2", "quote", "syn", @@ -4170,9 +4225,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -4189,9 +4244,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -4221,14 +4276,14 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snow" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" +checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.1", + "curve25519-dalek 4.0.0-rc.0", "rand_core 0.6.4", "ring", "rustc_version", @@ -4370,9 +4425,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -4434,9 +4489,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -4465,12 +4520,12 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "serde_with 2.1.0", + "serde_with 2.2.0", "soketto", "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.4", + "tokio-util 0.7.7", ] [[package]] @@ -4481,18 +4536,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -4501,10 +4556,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -4519,9 +4575,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2" dependencies = [ "itoa", "serde", @@ -4537,9 +4593,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c" dependencies = [ "time-core", ] @@ -4574,15 +4630,15 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.22.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", @@ -4595,7 +4651,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -4611,9 +4667,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -4637,9 +4693,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -4652,9 +4708,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -4795,9 +4851,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "turn" @@ -4820,9 +4876,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "types" @@ -4883,15 +4939,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -4953,9 +5009,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "getrandom 0.2.8", ] @@ -5023,9 +5079,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5033,9 +5089,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -5048,9 +5104,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -5060,9 +5116,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5070,9 +5126,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -5083,9 +5139,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-timer" @@ -5104,9 +5160,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -5231,9 +5287,9 @@ dependencies = [ [[package]] name = "webrtc-ice" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7" +checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" dependencies = [ "arc-swap", "async-trait", @@ -5355,9 +5411,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -5421,19 +5477,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" @@ -5443,9 +5523,9 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" @@ -5455,9 +5535,9 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" @@ -5467,9 +5547,9 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" @@ -5479,15 +5559,15 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" @@ -5497,9 +5577,9 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" diff --git a/scoring/Cargo.toml b/scoring/Cargo.toml index 8a1eb64..2f75abe 100644 --- a/scoring/Cargo.toml +++ b/scoring/Cargo.toml @@ -10,10 +10,17 @@ chrono = { version = "0.4.19", default-features = false, features = ["clock"] } delay_map = "0.1.1" futures = "0.3.24" gen_topology = { git = "https://github.com/sigp/gossipsub-testground", rev = "4084d26b9210bc932f4aaa45f9506ecfe5f2bb04" } -# TODO: update libp2p once the next version has been released. -libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", rev = "26215286391cc277270d6bbc88d3b2fc0de54c7d", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } + +# TODO: Update libp2p once the next version, which includes prometheus-client v0.20, has been released. +# See https://github.com/ackintosh/rust-libp2p/commit/df09870c8c2294cbaeb881f58d4f9752125562bc +libp2p = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "prometheus-client-0.20.0", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } + npg = { git = "https://github.com/sigp/eth-npg", rev = "6118cdd63eb34ffa4b230d17e88c8adf7057e138" } -prometheus-client = { version = "0.19.0", features = ["protobuf"] } + +# TODO: Update prometheus-client once the next version, which includes the fix, has been released. +# See https://github.com/prometheus/client_rust/pull/123 +prometheus-client = { git = "https://github.com/ackintosh/client_rust.git", branch = "fix/protobuf-labels", features = ["protobuf"] } + prost = "0.11" rand = "0.8.5" serde_json = "1.0" diff --git a/scoring/src/beacon_node.rs b/scoring/src/beacon_node.rs index f5c8d0e..08e3bd1 100644 --- a/scoring/src/beacon_node.rs +++ b/scoring/src/beacon_node.rs @@ -13,12 +13,12 @@ use libp2p::core::muxing::StreamMuxerBox; use libp2p::core::upgrade::{SelectUpgrade, Version}; use libp2p::dns::TokioDnsConfig; use libp2p::futures::StreamExt; -use libp2p::gossipsub::error::PublishError; use libp2p::gossipsub::metrics::Config; use libp2p::gossipsub::subscription_filter::AllowAllSubscriptionFilter; use libp2p::gossipsub::{ - FastMessageId, Gossipsub, GossipsubConfigBuilder, GossipsubEvent, GossipsubMessage, IdentTopic, - IdentityTransform, MessageAuthenticity, MessageId, RawGossipsubMessage, ValidationMode, + Behaviour, ConfigBuilder, Event, FastMessageId, IdentTopic, IdentityTransform, + Message as GossipsubMessage, MessageAuthenticity, MessageId, PublishError, RawMessage, + ValidationMode, }; use libp2p::identity::Keypair; use libp2p::mplex::MplexConfig; @@ -274,7 +274,7 @@ struct RecordMetricsInfo { } pub(crate) struct Network { - swarm: Swarm, + swarm: Swarm, node_id: usize, beacon_node_info: BeaconNodeInfo, participants: HashMap, @@ -310,11 +310,10 @@ impl Network { [..20], ) }; - let fast_gossip_message_id = |message: &RawGossipsubMessage| { - FastMessageId::from(&Sha256::digest(&message.data)[..8]) - }; + let fast_gossip_message_id = + |message: &RawMessage| FastMessageId::from(&Sha256::digest(&message.data)[..8]); - let gossipsub_config = GossipsubConfigBuilder::default() + let gossipsub_config = ConfigBuilder::default() // Following params are set based on lighthouse. .max_transmit_size(10 * 1_048_576) // 10M .prune_backoff(Duration::from_secs(PRUNE_BACKOFF)) @@ -338,7 +337,7 @@ impl Network { .build() .expect("Valid gossipsub configuration"); - let mut gs = Gossipsub::new_with_subscription_filter_and_transform( + let mut gs = Behaviour::new_with_subscription_filter_and_transform( MessageAuthenticity::Anonymous, gossipsub_config, Some((registry, Config::default())), @@ -583,9 +582,9 @@ impl Network { self.swarm.behaviour_mut().publish(ident_topic, msg) } - fn handle_gossipsub_event(&mut self, event: GossipsubEvent) { + fn handle_gossipsub_event(&mut self, event: Event) { match event { - GossipsubEvent::Message { + Event::Message { propagation_source: _, message_id: _, message, From 363b7bc31ddab29ed14b28efdc8343ae529c6bd4 Mon Sep 17 00:00:00 2001 From: ackintosh Date: Thu, 23 Feb 2023 07:25:15 +0900 Subject: [PATCH 08/10] smoke: Update libp2p and prometheus-client --- smoke/Cargo.lock | 2408 +++++++++++++++++++++++++++++++++++++++------ smoke/Cargo.toml | 4 +- smoke/Dockerfile | 2 +- smoke/src/main.rs | 31 +- 4 files changed, 2101 insertions(+), 344 deletions(-) diff --git a/smoke/Cargo.lock b/smoke/Cargo.lock index 74da24a..d2811e7 100644 --- a/smoke/Cargo.lock +++ b/smoke/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array", +] + [[package]] name = "aead" version = "0.4.3" @@ -9,6 +18,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array", + "rand_core 0.6.4", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher 0.2.5", ] [[package]] @@ -18,25 +39,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug", ] +[[package]] +name = "aes-gcm" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +dependencies = [ + "aead 0.3.2", + "aes 0.6.0", + "cipher 0.2.5", + "ctr 0.6.0", + "ghash 0.3.1", + "subtle", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", + "aead 0.4.3", + "aes 0.7.5", + "cipher 0.3.0", + "ctr 0.8.0", + "ghash 0.4.4", "subtle", ] +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -48,9 +103,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "arc-swap" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "arrayref" @@ -58,17 +119,120 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "asn1-rs" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive 0.1.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +dependencies = [ + "asn1-rs-derive 0.4.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "asn1_der" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +[[package]] +name = "async-io" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +dependencies = [ + "async-lock", + "autocfg", + "concurrent-queue", + "futures-lite", + "libc", + "log", + "parking", + "polling", + "slab", + "socket2", + "waker-fn", + "windows-sys 0.42.0", +] + +[[package]] +name = "async-lock" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +dependencies = [ + "event-listener", + "futures-lite", +] + [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -88,18 +252,63 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "atomic-waker" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" + [[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -108,9 +317,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ "digest 0.10.6", ] @@ -133,6 +342,22 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-modes" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" +dependencies = [ + "block-padding", + "cipher 0.2.5", +] + +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + [[package]] name = "bs58" version = "0.4.0" @@ -141,9 +366,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -153,15 +378,29 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde", +] [[package]] name = "cc" -version = "1.0.77" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "ccm" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" +dependencies = [ + "aead 0.3.2", + "cipher 0.2.5", + "subtle", +] [[package]] name = "cfg-if" @@ -176,7 +415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "zeroize", ] @@ -187,9 +426,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead", + "aead 0.4.3", "chacha20", - "cipher", + "cipher 0.3.0", "poly1305", "zeroize", ] @@ -205,6 +444,15 @@ dependencies = [ "serde", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] + [[package]] name = "cipher" version = "0.3.0" @@ -250,6 +498,37 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "concurrent-queue" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-oid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + [[package]] name = "core2" version = "0.4.0" @@ -268,6 +547,54 @@ dependencies = [ "libc", ] +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -278,20 +605,49 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "ctr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +dependencies = [ + "cipher 0.2.5", +] + [[package]] name = "ctr" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", ] [[package]] name = "curve25519-dalek" -version = "3.2.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", @@ -302,22 +658,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.2" +version = "4.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc3116fe595d7847c701796ac1b189bd86b81f4f593c6f775f9d80fb2e29f4" +checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac" dependencies = [ - "byteorder", - "digest 0.10.6", - "rand_core 0.6.4", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms", "subtle", "zeroize", ] [[package]] name = "darling" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" dependencies = [ "darling_core", "darling_macro", @@ -325,9 +682,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" dependencies = [ "fnv", "ident_case", @@ -339,9 +696,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" dependencies = [ "darling_core", "quote", @@ -350,41 +707,154 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] -name = "digest" -version = "0.9.0" +name = "data-encoding-macro" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" dependencies = [ - "generic-array", + "data-encoding", + "data-encoding-macro-internal", ] [[package]] -name = "digest" -version = "0.10.6" +name = "data-encoding-macro-internal" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ - "block-buffer 0.10.3", - "crypto-common", - "subtle", + "data-encoding", + "syn", +] + +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs 0.3.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "8.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +dependencies = [ + "asn1-rs 0.5.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer 0.10.3", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "dtoa" -version = "1.0.4" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" + +[[package]] +name = "ecdsa" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -395,7 +865,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.2.1", + "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", "serde", @@ -405,24 +875,46 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "elliptic-curve" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "digest 0.10.6", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck", "proc-macro2", @@ -430,15 +922,37 @@ dependencies = [ "syn", ] +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -462,9 +976,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -477,9 +991,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -487,15 +1001,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -505,32 +1019,58 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" + +[[package]] +name = "futures-lite" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "futures-rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" +dependencies = [ + "futures-io", + "rustls 0.20.8", + "webpki 0.22.0", +] + [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-timer" @@ -540,9 +1080,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-channel", "futures-core", @@ -588,6 +1128,16 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +dependencies = [ + "opaque-debug", + "polyval 0.4.5", +] + [[package]] name = "ghash" version = "0.4.4" @@ -595,7 +1145,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug", - "polyval", + "polyval 0.5.3", +] + +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", ] [[package]] @@ -625,25 +1186,69 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "hex_fmt" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac 0.11.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "hostname" version = "0.3.1" @@ -657,9 +1262,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -691,9 +1296,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -750,6 +1355,25 @@ dependencies = [ "winapi", ] +[[package]] +name = "if-watch" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" +dependencies = [ + "async-io", + "core-foundation", + "fnv", + "futures", + "if-addrs", + "ipnet", + "log", + "rtnetlink", + "system-configuration", + "tokio", + "windows", +] + [[package]] name = "indexmap" version = "1.9.2" @@ -798,6 +1422,25 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "interceptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" +dependencies = [ + "async-trait", + "bytes", + "log", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] + [[package]] name = "ipconfig" version = "0.3.1" @@ -812,9 +1455,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "ipnetwork" @@ -836,15 +1479,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -857,44 +1500,49 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] -name = "libp2p" -version = "0.48.0" +name = "libm" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c996fe5bfdba47f5a5af71d48ecbe8cec900b7b97391cc1d3ba1afb0e2d3b6" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + +[[package]] +name = "libp2p" +version = "0.51.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "lazy_static", "libp2p-core", "libp2p-dns", "libp2p-gossipsub", + "libp2p-kad", + "libp2p-mdns", "libp2p-metrics", "libp2p-mplex", "libp2p-noise", + "libp2p-quic", "libp2p-swarm", - "libp2p-swarm-derive", "libp2p-tcp", + "libp2p-webrtc", "libp2p-yamux", "multiaddr", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p-core" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fff5bd889c82a0aec668f2045edd066f559d4e5c40354e5a4c77ac00caac38" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asn1_der", "bs58", @@ -904,17 +1552,19 @@ dependencies = [ "futures", "futures-timer", "instant", - "lazy_static", "log", "multiaddr", "multihash", "multistream-select", + "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", "rw-stream-sink", + "sec1", + "serde", "sha2 0.10.6", "smallvec", "thiserror", @@ -925,9 +1575,8 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb3c16e3bb2f76c751ae12f0f26e788c89d353babdded40411e7923f01fc978" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "libp2p-core", @@ -939,12 +1588,11 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2185aac44b162c95180ae4ddd1f4dfb705217ea1cb8e16bdfc70d31496fd80fa" +version = "0.44.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "asynchronous-codec", - "base64", + "base64 0.20.0", "byteorder", "bytes", "fnv", @@ -954,74 +1602,141 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prometheus-client", + "prometheus-client 0.20.0", "prost", "prost-build", - "rand 0.7.3", + "prost-codec", + "rand 0.8.5", "regex", + "serde", "sha2 0.10.6", "smallvec", + "thiserror", "unsigned-varint", "wasm-timer", ] [[package]] -name = "libp2p-metrics" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74ab339e8b5d989e8c1000a78adb5c064a6319245bb22d1e70b415ec18c39b8" -dependencies = [ - "libp2p-core", - "libp2p-gossipsub", - "libp2p-swarm", - "prometheus-client", -] - -[[package]] -name = "libp2p-mplex" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce53169351226ee0eb18ee7bef8d38f308fa8ad7244f986ae776390c0ae8a44d" +name = "libp2p-kad" +version = "0.43.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ + "arrayvec", "asynchronous-codec", "bytes", + "either", + "fnv", "futures", + "futures-timer", + "instant", "libp2p-core", + "libp2p-swarm", "log", - "nohash-hasher", - "parking_lot 0.12.1", - "rand 0.7.3", + "prost", + "prost-build", + "rand 0.8.5", + "serde", + "sha2 0.10.6", "smallvec", + "thiserror", + "uint", "unsigned-varint", + "void", ] [[package]] -name = "libp2p-noise" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb0f939a444b06779ce551b3d78ebf13970ac27906ada452fd70abd160b09b8" +name = "libp2p-mdns" +version = "0.43.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ - "bytes", - "curve25519-dalek 3.2.1", + "data-encoding", "futures", - "lazy_static", + "if-watch", "libp2p-core", + "libp2p-swarm", "log", - "prost", + "rand 0.8.5", + "smallvec", + "socket2", + "tokio", + "trust-dns-proto", + "void", +] + +[[package]] +name = "libp2p-metrics" +version = "0.12.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" +dependencies = [ + "libp2p-core", + "libp2p-gossipsub", + "libp2p-swarm", + "prometheus-client 0.19.0", +] + +[[package]] +name = "libp2p-mplex" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" +dependencies = [ + "asynchronous-codec", + "bytes", + "futures", + "libp2p-core", + "log", + "nohash-hasher", + "parking_lot 0.12.1", + "rand 0.8.5", + "smallvec", + "unsigned-varint", +] + +[[package]] +name = "libp2p-noise" +version = "0.42.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" +dependencies = [ + "bytes", + "curve25519-dalek 3.2.0", + "futures", + "libp2p-core", + "log", + "once_cell", + "prost", "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha.2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" +dependencies = [ + "bytes", + "futures", + "futures-timer", + "if-watch", + "libp2p-core", + "libp2p-tls", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.8", + "thiserror", + "tokio", +] + [[package]] name = "libp2p-swarm" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ad2db60c06603606b54b58e4247e32efec87a93cb4387be24bf32926c600f2" +version = "0.42.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "either", "fnv", @@ -1031,48 +1746,83 @@ dependencies = [ "libp2p-core", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] -name = "libp2p-swarm-derive" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32" +name = "libp2p-tcp" +version = "0.39.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ - "heck", - "quote", - "syn", + "futures", + "futures-timer", + "if-watch", + "libc", + "libp2p-core", + "log", + "socket2", + "tokio", ] [[package]] -name = "libp2p-tcp" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9675432b4c94b3960f3d2c7e57427b81aea92aab67fd0eebef09e2ae0ff54895" +name = "libp2p-tls" +version = "0.1.0-alpha.2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ + "futures", + "futures-rustls", + "libp2p-core", + "rcgen 0.10.0", + "ring", + "rustls 0.20.8", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", +] + +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha.2" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" +dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", "futures", "futures-timer", - "if-addrs", - "ipnet", - "libc", + "hex", + "if-watch", "libp2p-core", + "libp2p-noise", "log", - "socket2", + "multihash", + "prost", + "prost-build", + "prost-codec", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", "tokio", + "tokio-util", + "webrtc", ] [[package]] name = "libp2p-yamux" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74ec8dc042b583f0b2b93d52917f3b374c1e4b1cfa79ee74c7672c41257694c" +version = "0.43.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "libp2p-core", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -1129,9 +1879,18 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] [[package]] name = "memchr" @@ -1139,34 +1898,49 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "multiaddr" -version = "0.14.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" dependencies = [ "arrayref", - "bs58", "byteorder", "data-encoding", + "multibase", "multihash", "percent-encoding", "serde", @@ -1175,15 +1949,28 @@ dependencies = [ "url", ] +[[package]] +name = "multibase" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" +dependencies = [ + "base-x", + "data-encoding", + "data-encoding-macro", +] + [[package]] name = "multihash" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "core2", "digest 0.10.6", "multihash-derive", + "serde", + "serde-big-array", "sha2 0.10.6", "unsigned-varint", ] @@ -1210,9 +1997,8 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" +version = "0.12.1" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "bytes", "futures", @@ -1222,12 +2008,100 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "netlink-packet-core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" +dependencies = [ + "anyhow", + "byteorder", + "libc", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-route" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" +dependencies = [ + "anyhow", + "bitflags", + "byteorder", + "libc", + "netlink-packet-core", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-utils" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" +dependencies = [ + "anyhow", + "byteorder", + "paste", + "thiserror", +] + +[[package]] +name = "netlink-proto" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" +dependencies = [ + "bytes", + "futures", + "log", + "netlink-packet-core", + "netlink-sys", + "thiserror", + "tokio", +] + +[[package]] +name = "netlink-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b" +dependencies = [ + "bytes", + "futures", + "libc", + "log", + "tokio", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "memoffset", +] + [[package]] name = "nohash-hasher" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1238,6 +2112,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -1259,19 +2144,37 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ "hermit-abi", "libc", ] +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs 0.3.1", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs 0.5.1", +] + [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -1291,6 +2194,44 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "p384" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "packed_simd_2" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm", +] + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + [[package]] name = "parking_lot" version = "0.11.2" @@ -1299,7 +2240,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -1309,14 +2250,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.7", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -1328,15 +2269,39 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "paste" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" + +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", ] [[package]] @@ -1347,9 +2312,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", "indexmap", @@ -1387,6 +2352,36 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + +[[package]] +name = "polling" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +dependencies = [ + "autocfg", + "cfg-if", + "libc", + "log", + "wepoll-ffi", + "windows-sys 0.42.0", +] + [[package]] name = "poly1305" version = "0.7.2" @@ -1398,6 +2393,17 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "polyval" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +dependencies = [ + "cpuid-bool", + "opaque-debug", + "universal-hash", +] + [[package]] name = "polyval" version = "0.5.3" @@ -1418,9 +2424,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", "syn", @@ -1462,30 +2468,51 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus-client" -version = "0.18.1" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e" +dependencies = [ + "dtoa", + "itoa", + "parking_lot 0.12.1", + "prometheus-client-derive-encode 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "prometheus-client" +version = "0.20.0" +source = "git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels#f3cd73ae35a3b01537dfb1f5fbb1cdc8d5c5e77a" +dependencies = [ + "dtoa", + "itoa", + "parking_lot 0.12.1", + "prometheus-client-derive-encode 0.4.1 (git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels)", +] + +[[package]] +name = "prometheus-client-derive-encode" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" +checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1" dependencies = [ - "dtoa", - "itoa", - "parking_lot 0.12.1", - "prometheus-client-derive-text-encode", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "prometheus-client-derive-text-encode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" +name = "prometheus-client-derive-encode" +version = "0.4.1" +source = "git+https://github.com/ackintosh/client_rust.git?branch=fix/protobuf-labels#f3cd73ae35a3b01537dfb1f5fbb1cdc8d5c5e77a" dependencies = [ "proc-macro2", "quote", @@ -1494,9 +2521,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -1504,9 +2531,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", "heck", @@ -1524,11 +2551,23 @@ dependencies = [ "which", ] +[[package]] +name = "prost-codec" +version = "0.3.0" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" +dependencies = [ + "asynchronous-codec", + "bytes", + "prost", + "thiserror", + "unsigned-varint", +] + [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -1539,9 +2578,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -1553,11 +2592,29 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quinn-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls 0.20.8", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki 0.22.0", +] + [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -1633,6 +2690,31 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rcgen" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +dependencies = [ + "pem", + "ring", + "time", + "x509-parser 0.13.2", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -1644,9 +2726,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -1679,11 +2761,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ - "base64", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -1721,6 +2803,17 @@ dependencies = [ "quick-error", ] +[[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint", + "hmac 0.12.1", + "zeroize", +] + [[package]] name = "ring" version = "0.16.20" @@ -1736,6 +2829,52 @@ dependencies = [ "winapi", ] +[[package]] +name = "rtcp" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" +dependencies = [ + "bytes", + "thiserror", + "webrtc-util", +] + +[[package]] +name = "rtnetlink" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" +dependencies = [ + "futures", + "log", + "netlink-packet-route", + "netlink-proto", + "nix", + "thiserror", + "tokio", +] + +[[package]] +name = "rtp" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" +dependencies = [ + "async-trait", + "bytes", + "rand 0.8.5", + "serde", + "thiserror", + "webrtc-util", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc_version" version = "0.4.0" @@ -1745,11 +2884,44 @@ dependencies = [ "semver", ] +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", +] + [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" +source = "git+https://github.com/ackintosh/rust-libp2p.git?branch=prometheus-client-0.20.0#df09870c8c2294cbaeb881f58d4f9752125562bc" dependencies = [ "futures", "pin-project", @@ -1758,9 +2930,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "scopeguard" @@ -1768,26 +2940,81 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sdp" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror", + "url", +] + +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] +[[package]] +name = "serde-big-array" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd31f59f6fe2b0c055371bb2f16d7f0aa7d8881676c04a55b1596d1a17cd10a4" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -1796,9 +3023,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ "itoa", "ryu", @@ -1807,9 +3034,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" dependencies = [ "proc-macro2", "quote", @@ -1830,9 +3057,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" +checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c" dependencies = [ "serde", "serde_with_macros", @@ -1840,9 +3067,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa" +checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" dependencies = [ "darling", "proc-macro2", @@ -1896,17 +3123,30 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + [[package]] name = "signature" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest 0.10.6", + "rand_core 0.6.4", +] [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -1933,14 +3173,14 @@ dependencies = [ [[package]] name = "snow" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" +checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d" dependencies = [ - "aes-gcm", + "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.2", + "curve25519-dalek 4.0.0-rc.0", "rand_core 0.6.4", "ring", "rustc_version", @@ -1964,7 +3204,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "futures", "httparse", @@ -1979,6 +3219,16 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -1991,6 +3241,34 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "stun" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" +dependencies = [ + "base64 0.13.1", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", +] + +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] + [[package]] name = "subtle" version = "2.4.1" @@ -1999,9 +3277,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.104" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -2020,6 +3298,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "system-configuration" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tempfile" version = "3.3.0" @@ -2065,18 +3364,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -2085,13 +3384,51 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] +[[package]] +name = "time" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -2103,15 +3440,15 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.22.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", @@ -2119,17 +3456,19 @@ dependencies = [ "memchr", "mio", "num_cpus", + "parking_lot 0.12.1", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.42.0", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -2138,9 +3477,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -2149,9 +3488,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -2164,9 +3503,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -2241,9 +3580,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", "cfg-if", @@ -2255,58 +3594,90 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", + "socket2", "thiserror", "tinyvec", "tokio", + "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ "cfg-if", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", "tokio", - "trust-dns-proto", + "tracing", + "trust-dns-proto", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "turn" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" +dependencies = [ + "async-trait", + "base64 0.13.1", + "futures", + "log", + "md-5", + "rand 0.8.5", + "ring", + "stun", + "thiserror", + "tokio", + "webrtc-util", ] [[package]] -name = "try-lock" -version = "0.2.3" +name = "typenum" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] -name = "typenum" -version = "1.15.0" +name = "uint" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -2360,6 +3731,15 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "uuid" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +dependencies = [ + "getrandom 0.2.8", +] + [[package]] name = "valuable" version = "0.1.0" @@ -2378,6 +3758,21 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "want" version = "0.3.0" @@ -2402,9 +3797,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2412,9 +3807,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -2427,9 +3822,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -2439,9 +3834,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2449,9 +3844,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -2462,9 +3857,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-timer" @@ -2483,19 +3878,260 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webrtc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "hex", + "interceptor", + "lazy_static", + "log", + "rand 0.8.5", + "rcgen 0.9.3", + "regex", + "ring", + "rtcp", + "rtp", + "rustls 0.19.1", + "sdp", + "serde", + "serde_json", + "sha2 0.10.6", + "stun", + "thiserror", + "time", + "tokio", + "turn", + "url", + "waitgroup", + "webrtc-data", + "webrtc-dtls", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "webrtc-data" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" +dependencies = [ + "bytes", + "derive_builder", + "log", + "thiserror", + "tokio", + "webrtc-sctp", + "webrtc-util", +] + +[[package]] +name = "webrtc-dtls" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f" +dependencies = [ + "aes 0.6.0", + "aes-gcm 0.8.0", + "async-trait", + "bincode", + "block-modes", + "byteorder", + "ccm", + "curve25519-dalek 3.2.0", + "der-parser 8.1.0", + "elliptic-curve", + "hkdf", + "hmac 0.10.1", + "log", + "oid-registry 0.6.1", + "p256", + "p384", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen 0.9.3", + "ring", + "rustls 0.19.1", + "sec1", + "serde", + "sha-1", + "sha2 0.9.9", + "signature", + "subtle", + "thiserror", + "tokio", + "webpki 0.21.4", + "webrtc-util", + "x25519-dalek 2.0.0-pre.1", + "x509-parser 0.13.2", +] + +[[package]] +name = "webrtc-ice" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" +dependencies = [ + "arc-swap", + "async-trait", + "crc", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "stun", + "thiserror", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util", +] + +[[package]] +name = "webrtc-mdns" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" +dependencies = [ + "log", + "socket2", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-media" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" +dependencies = [ + "byteorder", + "bytes", + "derive_builder", + "displaydoc", + "rand 0.8.5", + "rtp", + "thiserror", + "webrtc-util", +] + +[[package]] +name = "webrtc-sctp" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "rand 0.8.5", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-srtp" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" +dependencies = [ + "aead 0.4.3", + "aes 0.7.5", + "aes-gcm 0.9.4", + "async-trait", + "byteorder", + "bytes", + "ctr 0.8.0", + "hmac 0.11.0", + "log", + "rtcp", + "rtp", + "sha-1", + "subtle", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" +dependencies = [ + "async-trait", + "bitflags", + "bytes", + "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", +] + +[[package]] +name = "wepoll-ffi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +dependencies = [ + "cc", +] + [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -2530,6 +4166,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +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", +] + [[package]] name = "windows-sys" version = "0.42.0" @@ -2537,55 +4186,109 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" @@ -2598,15 +4301,63 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "1.2.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" +checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" dependencies = [ - "curve25519-dalek 3.2.1", + "curve25519-dalek 3.2.0", "rand_core 0.5.1", "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "2.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +dependencies = [ + "curve25519-dalek 3.2.0", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +dependencies = [ + "asn1-rs 0.3.1", + "base64 0.13.1", + "data-encoding", + "der-parser 7.0.0", + "lazy_static", + "nom", + "oid-registry 0.4.0", + "ring", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +dependencies = [ + "asn1-rs 0.5.1", + "base64 0.13.1", + "data-encoding", + "der-parser 8.1.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + [[package]] name = "yamux" version = "0.10.2" @@ -2621,20 +4372,29 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yasna" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +dependencies = [ + "time", +] + [[package]] name = "zeroize" -version = "1.3.0" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", diff --git a/smoke/Cargo.toml b/smoke/Cargo.toml index fe1b5a9..7e10e3b 100644 --- a/smoke/Cargo.toml +++ b/smoke/Cargo.toml @@ -6,7 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libp2p = { version = "0.48.0", default-features = false, features = ["gossipsub", "dns-tokio", "tcp-tokio", "noise", "mplex", "yamux"] } +# TODO: Update libp2p once the next version, which includes prometheus-client v0.20, has been released. +# See https://github.com/ackintosh/rust-libp2p/commit/df09870c8c2294cbaeb881f58d4f9752125562bc +libp2p = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "prometheus-client-0.20.0", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } rand = "0.8.5" serde = "1.0.137" serde_json = "1.0.81" diff --git a/smoke/Dockerfile b/smoke/Dockerfile index 35d3363..0529b64 100644 --- a/smoke/Dockerfile +++ b/smoke/Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile is for the `docker:generic` builder. # See https://docs.testground.ai/builder-library/docker-generic for details about the builder. -FROM rust:1.64-bullseye as builder +FROM rust:1.67-bullseye as builder WORKDIR /usr/src/test-plan # * `prost-build`, a dependency of `libp2p-gossipsub`, requires cmake. diff --git a/smoke/src/main.rs b/smoke/src/main.rs index 5edb1aa..ac08a74 100644 --- a/smoke/src/main.rs +++ b/smoke/src/main.rs @@ -8,15 +8,15 @@ use libp2p::futures::FutureExt; use libp2p::futures::StreamExt; use libp2p::gossipsub::subscription_filter::AllowAllSubscriptionFilter; use libp2p::gossipsub::{ - Gossipsub, GossipsubConfigBuilder, GossipsubEvent, IdentTopic as Topic, IdentityTransform, - MessageAuthenticity, + Behaviour, ConfigBuilder, Event, IdentTopic as Topic, IdentityTransform, MessageAuthenticity, }; use libp2p::identity::Keypair; use libp2p::mplex::MplexConfig; use libp2p::multiaddr::Protocol; use libp2p::noise::NoiseConfig; use libp2p::swarm::{SwarmBuilder, SwarmEvent}; -use libp2p::tcp::{GenTcpConfig, TokioTcpTransport}; +use libp2p::tcp::tokio::Transport as TcpTransport; +use libp2p::tcp::Config as TcpConfig; use libp2p::yamux::YamuxConfig; use libp2p::{Multiaddr, PeerId, Swarm, Transport}; use rand::seq::SliceRandom; @@ -50,7 +50,7 @@ async fn main() -> Result<(), Box> { // //////////////////////////////////////////////////////////////////////// let mut swarm = { // Build a Gossipsub network behaviour. - let gossipsub_config = GossipsubConfigBuilder::default() + let gossipsub_config = ConfigBuilder::default() .history_length( client .run_parameters() @@ -61,7 +61,7 @@ async fn main() -> Result<(), Box> { ) .build() .expect("Valid configuration"); - let gossipsub = Gossipsub::new_with_subscription_filter_and_transform( + let gossipsub = Behaviour::new_with_subscription_filter_and_transform( MessageAuthenticity::Signed(local_key.clone()), gossipsub_config, None, @@ -70,10 +70,7 @@ async fn main() -> Result<(), Box> { ) .expect("Valid configuration"); - SwarmBuilder::new(build_transport(&local_key), gossipsub, local_peer_id) - .executor(Box::new(|future| { - tokio::spawn(future); - })) + SwarmBuilder::with_tokio_executor(build_transport(&local_key), gossipsub, local_peer_id) .build() }; @@ -164,7 +161,7 @@ async fn main() -> Result<(), Box> { loop { match swarm.select_next_some().await { SwarmEvent::Behaviour(gossipsub_event) => match gossipsub_event { - GossipsubEvent::Subscribed { peer_id, topic } => { + Event::Subscribed { peer_id, topic } => { client.record_message(format!( "Peer {} subscribed to a topic: {}", peer_id, topic @@ -210,7 +207,7 @@ async fn main() -> Result<(), Box> { loop { match swarm.select_next_some().await { SwarmEvent::Behaviour(gossipsub_event) => match gossipsub_event { - GossipsubEvent::Message { + Event::Message { propagation_source, message_id: _, message, @@ -261,10 +258,8 @@ async fn main() -> Result<(), Box> { // Set up an encrypted TCP transport over the Mplex and Yamux protocols. fn build_transport(keypair: &Keypair) -> libp2p::core::transport::Boxed<(PeerId, StreamMuxerBox)> { - let transport = TokioDnsConfig::system(TokioTcpTransport::new( - GenTcpConfig::default().nodelay(true), - )) - .expect("DNS config"); + let transport = TokioDnsConfig::system(TcpTransport::new(TcpConfig::default().nodelay(true))) + .expect("DNS config"); let noise_keys = libp2p::noise::Keypair::::new() .into_authentic(keypair) @@ -320,7 +315,7 @@ async fn publish_and_collect( /// Sets a barrier on the supplied state that fires when it reaches all participants. async fn barrier_and_drive_swarm( client: &Client, - swarm: &mut Swarm, + swarm: &mut Swarm, state: impl Into> + Copy, event_subscribed: &mut usize, event_message: &mut HashSet, @@ -342,14 +337,14 @@ async fn barrier_and_drive_swarm( for event in &events { match event { SwarmEvent::Behaviour(gossipsub_event) => match gossipsub_event { - GossipsubEvent::Subscribed { peer_id, topic } => { + Event::Subscribed { peer_id, topic } => { client.record_message(format!( "Peer {} subscribed to a topic: {}", peer_id, topic )); *event_subscribed += 1; } - GossipsubEvent::Message { + Event::Message { propagation_source, message_id: _, message, From 4f1a5e94b9a28a0dadef9067d746d5122968a309 Mon Sep 17 00:00:00 2001 From: ackintosh Date: Thu, 23 Feb 2023 08:34:36 +0900 Subject: [PATCH 09/10] Update testground --- censoring/Cargo.lock | 6 +- censoring/Cargo.toml | 3 +- censoring/src/honest.rs | 130 ++++++++++++------ censoring/src/utils.rs | 8 +- eth_consensus/Cargo.lock | 6 +- eth_consensus/Cargo.toml | 3 +- eth_consensus/simulation/Cargo.toml | 2 +- eth_consensus/simulation/src/network.rs | 4 +- .../simulation/src/network/metrics.rs | 4 +- eth_consensus/simulation/src/network/run.rs | 9 +- eth_consensus/simulation/src/utils.rs | 12 +- scoring/Cargo.lock | 6 +- scoring/Cargo.toml | 3 +- smoke/Cargo.lock | 6 +- smoke/Cargo.toml | 3 +- 15 files changed, 124 insertions(+), 81 deletions(-) diff --git a/censoring/Cargo.lock b/censoring/Cargo.lock index 4da93a7..19f1449 100644 --- a/censoring/Cargo.lock +++ b/censoring/Cargo.lock @@ -3819,10 +3819,10 @@ dependencies = [ [[package]] name = "testground" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83adf43990b4ebb757e826cba56b0bc6a09132f960dc981978cd5a011b7697f" +version = "0.5.0" +source = "git+https://github.com/testground/sdk-rust.git?rev=1fd032ec29361a00b25c0c8a6bac5f19a43019eb#1fd032ec29361a00b25c0c8a6bac5f19a43019eb" dependencies = [ + "chrono", "clap", "futures", "if-addrs", diff --git a/censoring/Cargo.toml b/censoring/Cargo.toml index 36578c4..aadbbda 100644 --- a/censoring/Cargo.toml +++ b/censoring/Cargo.toml @@ -21,7 +21,8 @@ libp2p-testground = { git = "https://github.com/ackintosh/rust-libp2p.git", rev rand = "0.8.5" serde = "1.0.139" serde_json = "1.0.82" -testground = "0.4" +# TODO: Update testground once the next version(v0.5.0). +testground = { git = "https://github.com/testground/sdk-rust.git", rev = "1fd032ec29361a00b25c0c8a6bac5f19a43019eb" } tokio = { version = "1.20.0", features = ["macros"] } tracing = "0.1.35" tracing-subscriber = { version = "0.3.14", features = ["env-filter"] } diff --git a/censoring/src/honest.rs b/censoring/src/honest.rs index 2e4c84c..31a5458 100644 --- a/censoring/src/honest.rs +++ b/censoring/src/honest.rs @@ -3,7 +3,7 @@ use crate::utils::{ BARRIER_DONE, BARRIER_STARTED_LIBP2P, BARRIER_WARMUP, }; use crate::{InstanceInfo, Role}; -use chrono::{DateTime, Local, Utc}; +use chrono::Local; use libp2p::core::muxing::StreamMuxerBox; use libp2p::core::upgrade::{SelectUpgrade, Version}; use libp2p::dns::TokioDnsConfig; @@ -11,8 +11,8 @@ use libp2p::futures::StreamExt; use libp2p::gossipsub::metrics::Config; use libp2p::gossipsub::subscription_filter::AllowAllSubscriptionFilter; use libp2p::gossipsub::{ - Behaviour, ConfigBuilder, IdentTopic, IdentityTransform, MessageAuthenticity, - PeerScoreParams, PeerScoreThresholds, Topic, TopicScoreParams, + Behaviour, ConfigBuilder, IdentTopic, IdentityTransform, MessageAuthenticity, PeerScoreParams, + PeerScoreThresholds, Topic, TopicScoreParams, }; use libp2p::identity::Keypair; use libp2p::mplex::MplexConfig; @@ -161,38 +161,56 @@ pub(crate) async fn run( // The `test_start_time` is used as the timestamp of metrics instead of local time of each // instance so the timestamps between metrics of each instance are aligned. // This is helpful when we want to sort metrics by something not timestamp(e.g. instance_name). - let test_start_time: DateTime = - DateTime::parse_from_rfc3339(&client.run_parameters().test_start_time)?.into(); - for family in metric_set.metric_families.iter() { let q = match family.name.as_str() { // /////////////////////////////////// // Metrics per known topic // /////////////////////////////////// - "topic_subscription_status" => { - queries_for_gauge(&test_start_time, family, &instance_info, run_id, "status") - } - "topic_peers_counts" => { - queries_for_gauge(&test_start_time, family, &instance_info, run_id, "count") - } + "topic_subscription_status" => queries_for_gauge( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + "status", + ), + "topic_peers_counts" => queries_for_gauge( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + "count", + ), "invalid_messages_per_topic" | "accepted_messages_per_topic" | "ignored_messages_per_topic" - | "rejected_messages_per_topic" => { - queries_for_counter(&test_start_time, family, &instance_info, run_id) - } + | "rejected_messages_per_topic" => queries_for_counter( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + ), // /////////////////////////////////// // Metrics regarding mesh state // /////////////////////////////////// - "mesh_peer_counts" => { - queries_for_gauge(&test_start_time, family, &instance_info, run_id, "count") - } - "mesh_peer_inclusion_events" => { - queries_for_counter(&test_start_time, family, &instance_info, run_id) - } - "mesh_peer_churn_events" => { - queries_for_counter(&test_start_time, family, &instance_info, run_id) - } + "mesh_peer_counts" => queries_for_gauge( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + "count", + ), + "mesh_peer_inclusion_events" => queries_for_counter( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + ), + "mesh_peer_churn_events" => queries_for_counter( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + ), // /////////////////////////////////// // Metrics regarding messages sent/received // /////////////////////////////////// @@ -201,36 +219,58 @@ pub(crate) async fn run( | "topic_msg_sent_bytes" | "topic_msg_recv_counts_unfiltered" | "topic_msg_recv_counts" - | "topic_msg_recv_bytes" => { - queries_for_counter(&test_start_time, family, &instance_info, run_id) - } + | "topic_msg_recv_bytes" => queries_for_counter( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + ), // /////////////////////////////////// // Metrics related to scoring // /////////////////////////////////// - "score_per_mesh" => { - queries_for_histogram(&test_start_time, family, &instance_info, run_id) - } - "scoring_penalties" => { - queries_for_counter(&test_start_time, family, &instance_info, run_id) - } + "score_per_mesh" => queries_for_histogram( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + ), + "scoring_penalties" => queries_for_counter( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + ), // /////////////////////////////////// // General Metrics // /////////////////////////////////// - "peers_per_protocol" => { - queries_for_gauge(&test_start_time, family, &instance_info, run_id, "peers") - } - "heartbeat_duration" => { - queries_for_histogram(&test_start_time, family, &instance_info, run_id) - } + "peers_per_protocol" => queries_for_gauge( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + "peers", + ), + "heartbeat_duration" => queries_for_histogram( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + ), // /////////////////////////////////// // Performance metrics // /////////////////////////////////// - "topic_iwant_msgs" => { - queries_for_counter(&test_start_time, family, &instance_info, run_id) - } - "memcache_misses" => { - queries_for_counter(&test_start_time, family, &instance_info, run_id) - } + "topic_iwant_msgs" => queries_for_counter( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + ), + "memcache_misses" => queries_for_counter( + &client.run_parameters().test_start_time, + family, + &instance_info, + run_id, + ), _ => unreachable!(), }; diff --git a/censoring/src/utils.rs b/censoring/src/utils.rs index c5cd7be..9a859ba 100644 --- a/censoring/src/utils.rs +++ b/censoring/src/utils.rs @@ -1,5 +1,5 @@ use crate::InstanceInfo; -use chrono::{DateTime, Local, Utc}; +use chrono::{DateTime, FixedOffset, Local}; use libp2p::futures::FutureExt; use libp2p::futures::{Stream, StreamExt}; use prometheus_client::encoding::protobuf::openmetrics_data_model::counter_value; @@ -93,7 +93,7 @@ where /// Create InfluxDB queries for Counter metrics. pub(crate) fn queries_for_counter( - datetime: &DateTime, + datetime: &DateTime, family: &MetricFamily, instance_info: &InstanceInfo, run_id: &str, @@ -122,7 +122,7 @@ pub(crate) fn queries_for_counter( /// Create InfluxDB queries for Gauge metrics. pub(crate) fn queries_for_gauge( - datetime: &DateTime, + datetime: &DateTime, family: &MetricFamily, instance_info: &InstanceInfo, run_id: &str, @@ -152,7 +152,7 @@ pub(crate) fn queries_for_gauge( /// Create InfluxDB queries for Histogram metrics. pub(crate) fn queries_for_histogram( - datetime: &DateTime, + datetime: &DateTime, family: &MetricFamily, instance_info: &InstanceInfo, run_id: &str, diff --git a/eth_consensus/Cargo.lock b/eth_consensus/Cargo.lock index 5448338..130126c 100644 --- a/eth_consensus/Cargo.lock +++ b/eth_consensus/Cargo.lock @@ -4268,10 +4268,10 @@ dependencies = [ [[package]] name = "testground" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83adf43990b4ebb757e826cba56b0bc6a09132f960dc981978cd5a011b7697f" +version = "0.5.0" +source = "git+https://github.com/testground/sdk-rust.git?rev=1fd032ec29361a00b25c0c8a6bac5f19a43019eb#1fd032ec29361a00b25c0c8a6bac5f19a43019eb" dependencies = [ + "chrono", "clap 3.2.23", "futures", "if-addrs", diff --git a/eth_consensus/Cargo.toml b/eth_consensus/Cargo.toml index 4d009fe..d41f2af 100644 --- a/eth_consensus/Cargo.toml +++ b/eth_consensus/Cargo.toml @@ -9,7 +9,8 @@ members = [ [workspace.dependencies] serde_json = "1.0" serde = "1.0" -testground = "0.4.0" +# TODO: Update testground once the next version(v0.5.0). +testground = { git = "https://github.com/testground/sdk-rust.git", rev = "1fd032ec29361a00b25c0c8a6bac5f19a43019eb" } tokio = { version = "1.21.2", features = ["macros"] } tracing = "0.1.35" tracing-subscriber = { version = "0.3.14", features = ["env-filter"] } diff --git a/eth_consensus/simulation/Cargo.toml b/eth_consensus/simulation/Cargo.toml index 8b40c36..1a32ba0 100644 --- a/eth_consensus/simulation/Cargo.toml +++ b/eth_consensus/simulation/Cargo.toml @@ -17,7 +17,7 @@ prometheus-client = { git = "https://github.com/ackintosh/client_rust.git", bran libp2p = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "prometheus-client-0.20.0", default-features = false, features = ["gossipsub", "dns", "tcp", "tokio", "noise", "mplex", "yamux", "serde"] } serde_json = "1.0" serde = "1.0" -testground = "0.4.0" +testground.workspace = true tokio = { version = "1.21.2", features = ["macros"] } tracing = "0.1.35" tracing-subscriber = { version = "0.3.14", features = ["env-filter"] } diff --git a/eth_consensus/simulation/src/network.rs b/eth_consensus/simulation/src/network.rs index ab95912..26e5bbe 100644 --- a/eth_consensus/simulation/src/network.rs +++ b/eth_consensus/simulation/src/network.rs @@ -1,5 +1,5 @@ use crate::InstanceInfo; -use chrono::{DateTime, Utc}; +use chrono::{DateTime, FixedOffset}; use futures::stream::FuturesUnordered; use libp2p::gossipsub::{ Behaviour, Event, HandlerError, IdentTopic, MessageId, Topic as GossipTopic, @@ -41,7 +41,7 @@ pub struct Network { /// Testground client. client: Arc, /// Chronos time reported by testground as the start of the test run. - start_time: DateTime, + start_time: DateTime, /// Instant in which the simmulation starts running, according to the local time. local_start_time: Instant, /// How often metrics are recorded. diff --git a/eth_consensus/simulation/src/network/metrics.rs b/eth_consensus/simulation/src/network/metrics.rs index 21ad6d8..bc72e6a 100644 --- a/eth_consensus/simulation/src/network/metrics.rs +++ b/eth_consensus/simulation/src/network/metrics.rs @@ -3,7 +3,7 @@ use crate::utils::{ queries_for_histogram, }; use crate::InstanceInfo; -use chrono::{DateTime, Utc}; +use chrono::{DateTime, FixedOffset}; use libp2p::gossipsub::IdentTopic; use prometheus_client::encoding::protobuf::openmetrics_data_model::MetricSet; use std::sync::Arc; @@ -21,7 +21,7 @@ pub(crate) struct RecordMetricsInfo { metrics: MetricSet, node_id: usize, instance_info: InstanceInfo, - current: DateTime, + current: DateTime, } impl Network { diff --git a/eth_consensus/simulation/src/network/run.rs b/eth_consensus/simulation/src/network/run.rs index 68b617e..ef999db 100644 --- a/eth_consensus/simulation/src/network/run.rs +++ b/eth_consensus/simulation/src/network/run.rs @@ -1,6 +1,5 @@ use crate::utils::{record_instance_info, BARRIER_LIBP2P_READY, BARRIER_TOPOLOGY_READY}; use crate::InstanceInfo; -use chrono::{DateTime, Utc}; use futures::stream::FuturesUnordered; use gen_topology::Params; use libp2p::core::muxing::StreamMuxerBox; @@ -282,10 +281,10 @@ impl Network { .build(validator_set) .expect("need to adjust these params"); - let start_time: DateTime = - DateTime::parse_from_rfc3339(&client.run_parameters().test_start_time) - .expect("Correct time date format from testground") - .into(); + let start_time = client.run_parameters().test_start_time; + // DateTime::parse_from_rfc3339(&client.run_parameters().test_start_time) + // .expect("Correct time date format from testground") + // .into(); let local_start_time = Instant::now(); Network { diff --git a/eth_consensus/simulation/src/utils.rs b/eth_consensus/simulation/src/utils.rs index cbcf76e..dd9cc0d 100644 --- a/eth_consensus/simulation/src/utils.rs +++ b/eth_consensus/simulation/src/utils.rs @@ -1,5 +1,5 @@ use crate::InstanceInfo; -use chrono::{DateTime, Local, Utc}; +use chrono::{DateTime, FixedOffset, Local}; use libp2p::futures::StreamExt; use libp2p::PeerId; use prometheus_client::encoding::protobuf::openmetrics_data_model::counter_value; @@ -54,7 +54,7 @@ pub(crate) async fn publish_and_collect( /// Create InfluxDB queries for Counter metrics. pub(crate) fn queries_for_counter( - datetime: &DateTime, + datetime: &DateTime, family: &MetricFamily, node_id: usize, instance_info: &InstanceInfo, @@ -84,7 +84,7 @@ pub(crate) fn queries_for_counter( /// Create InfluxDB queries for Counter metrics. pub(crate) fn initialise_counter( - datetime: &DateTime, + datetime: &DateTime, name: String, hash: String, node_id: usize, @@ -102,7 +102,7 @@ pub(crate) fn initialise_counter( /// Create InfluxDB queries joining counter metrics #[allow(clippy::too_many_arguments)] pub(crate) fn queries_for_counter_join( - datetime: &DateTime, + datetime: &DateTime, family1: &MetricFamily, family2: &MetricFamily, name: &str, @@ -159,7 +159,7 @@ pub(crate) fn queries_for_counter_join( /// Create InfluxDB queries for Gauge metrics. pub(crate) fn queries_for_gauge( - datetime: &DateTime, + datetime: &DateTime, family: &MetricFamily, node_id: usize, instance_info: &InstanceInfo, @@ -190,7 +190,7 @@ pub(crate) fn queries_for_gauge( /// Create InfluxDB queries for Histogram metrics. pub(crate) fn queries_for_histogram( - datetime: &DateTime, + datetime: &DateTime, family: &MetricFamily, node_id: usize, instance_info: &InstanceInfo, diff --git a/scoring/Cargo.lock b/scoring/Cargo.lock index eae44ed..a6e66b6 100644 --- a/scoring/Cargo.lock +++ b/scoring/Cargo.lock @@ -4507,10 +4507,10 @@ dependencies = [ [[package]] name = "testground" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83adf43990b4ebb757e826cba56b0bc6a09132f960dc981978cd5a011b7697f" +version = "0.5.0" +source = "git+https://github.com/testground/sdk-rust.git?rev=1fd032ec29361a00b25c0c8a6bac5f19a43019eb#1fd032ec29361a00b25c0c8a6bac5f19a43019eb" dependencies = [ + "chrono", "clap", "futures", "if-addrs", diff --git a/scoring/Cargo.toml b/scoring/Cargo.toml index 2f75abe..259e397 100644 --- a/scoring/Cargo.toml +++ b/scoring/Cargo.toml @@ -27,7 +27,8 @@ serde_json = "1.0" serde = "1.0" sha2 = "0.10" slot_clock = { git = "https://github.com/divagant-martian/lighthouse", branch = "sizes" } -testground = "0.4.0" +# TODO: Update testground once the next version(v0.5.0). +testground = { git = "https://github.com/testground/sdk-rust.git", rev = "1fd032ec29361a00b25c0c8a6bac5f19a43019eb" } tokio = { version = "1.21.2", features = ["macros"] } tracing = "0.1.35" tracing-subscriber = { version = "0.3.14", features = ["env-filter"] } diff --git a/smoke/Cargo.lock b/smoke/Cargo.lock index d2811e7..5d41175 100644 --- a/smoke/Cargo.lock +++ b/smoke/Cargo.lock @@ -3335,10 +3335,10 @@ dependencies = [ [[package]] name = "testground" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83adf43990b4ebb757e826cba56b0bc6a09132f960dc981978cd5a011b7697f" +version = "0.5.0" +source = "git+https://github.com/testground/sdk-rust.git?rev=1fd032ec29361a00b25c0c8a6bac5f19a43019eb#1fd032ec29361a00b25c0c8a6bac5f19a43019eb" dependencies = [ + "chrono", "clap", "futures", "if-addrs", diff --git a/smoke/Cargo.toml b/smoke/Cargo.toml index 7e10e3b..5aafca2 100644 --- a/smoke/Cargo.toml +++ b/smoke/Cargo.toml @@ -12,7 +12,8 @@ libp2p = { git = "https://github.com/ackintosh/rust-libp2p.git", branch = "prome rand = "0.8.5" serde = "1.0.137" serde_json = "1.0.81" -testground = "0.4.0" +# TODO: Update testground once the next version(v0.5.0). +testground = { git = "https://github.com/testground/sdk-rust.git", rev = "1fd032ec29361a00b25c0c8a6bac5f19a43019eb" } tokio = { version = "1.19.2", features = ["macros"] } tracing = "0.1.35" tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } From 6141dfd3d63d1097d7f98058ef752b67c1a3968c Mon Sep 17 00:00:00 2001 From: ackintosh Date: Thu, 23 Feb 2023 15:45:00 +0900 Subject: [PATCH 10/10] Bump up the rust version --- censoring/Dockerfile | 2 +- eth_consensus/Dockerfile | 2 +- scoring/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/censoring/Dockerfile b/censoring/Dockerfile index eda8807..5390482 100644 --- a/censoring/Dockerfile +++ b/censoring/Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile is for the `docker:generic` builder. # See https://docs.testground.ai/builder-library/docker-generic for details about the builder. -FROM rust:1.65-bullseye as builder +FROM rust:1.67-bullseye as builder WORKDIR /usr/src/test-plan # * `prost-build`, a dependency of `libp2p-gossipsub`, requires cmake. diff --git a/eth_consensus/Dockerfile b/eth_consensus/Dockerfile index 9984c99..83ee910 100644 --- a/eth_consensus/Dockerfile +++ b/eth_consensus/Dockerfile @@ -1,5 +1,5 @@ # Get chef -FROM rust:1.65-bullseye as chef +FROM rust:1.67-bullseye as chef WORKDIR test-plan RUN cargo install cargo-chef diff --git a/scoring/Dockerfile b/scoring/Dockerfile index d660bb6..f9721ed 100644 --- a/scoring/Dockerfile +++ b/scoring/Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile is for the `docker:generic` builder. # See https://docs.testground.ai/builder-library/docker-generic for details about the builder. -FROM rust:1.65-bullseye as builder +FROM rust:1.67-bullseye as builder WORKDIR /usr/src/test-plan # * `prost-build`, a dependency of `libp2p-gossipsub`, requires cmake.