diff --git a/Cargo.lock b/Cargo.lock index be9b18e2a..5599b144c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -198,12 +198,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - [[package]] name = "ark-bls12-377" version = "0.4.0" @@ -538,30 +532,14 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "asn1-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" -dependencies = [ - "asn1-rs-derive 0.4.0", - "asn1-rs-impl 0.1.0", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - [[package]] name = "asn1-rs" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" dependencies = [ - "asn1-rs-derive 0.5.0", - "asn1-rs-impl 0.2.0", + "asn1-rs-derive", + "asn1-rs-impl", "displaydoc", "nom", "num-traits", @@ -570,18 +548,6 @@ dependencies = [ "time", ] -[[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 1.0.109", - "synstructure 0.12.6", -] - [[package]] name = "asn1-rs-derive" version = "0.5.0" @@ -591,18 +557,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.87", - "synstructure 0.13.1", -] - -[[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 1.0.109", + "synstructure", ] [[package]] @@ -934,7 +889,7 @@ dependencies = [ [[package]] name = "avail-light-bootstrap" -version = "0.4.1" +version = "0.4.2" dependencies = [ "anyhow", "async-std", @@ -944,7 +899,6 @@ dependencies = [ "hex", "libp2p", "libp2p-allow-block-list", - "libp2p-webrtc", "multihash 0.14.0", "opentelemetry", "opentelemetry-otlp", @@ -1026,7 +980,6 @@ dependencies = [ "libc", "libp2p", "libp2p-allow-block-list", - "libp2p-webrtc", "libp2p-webrtc-websys", "mockall", "multihash 0.14.0", @@ -1461,7 +1414,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding 0.2.1", + "block-padding", "generic-array", ] @@ -1480,15 +1433,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - [[package]] name = "blocking" version = "1.6.1" @@ -1561,15 +1505,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - [[package]] name = "cc" version = "1.0.104" @@ -1581,18 +1516,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "ccm" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847" -dependencies = [ - "aead", - "cipher", - "ctr", - "subtle", -] - [[package]] name = "cesu8" version = "1.1.0" @@ -1952,21 +1875,6 @@ dependencies = [ "serde", ] -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - [[package]] name = "crc32fast" version = "1.4.2" @@ -2204,31 +2112,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", - "pem-rfc7468", "zeroize", ] -[[package]] -name = "der-parser" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" -dependencies = [ - "asn1-rs 0.5.2", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", -] - [[package]] name = "der-parser" version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" dependencies = [ - "asn1-rs 0.6.1", + "asn1-rs", "displaydoc", "nom", "num-bigint", @@ -2623,8 +2516,6 @@ dependencies = [ "ff", "generic-array", "group", - "hkdf", - "pem-rfc7468", "pkcs8", "rand_core", "sec1", @@ -3681,7 +3572,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -3970,7 +3861,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "block-padding 0.3.3", "generic-array", ] @@ -3995,25 +3885,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "interceptor" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5927883184e6a819b22d5e4f5f7bc7ca134fde9b2026fbddd8d95249746ba21e" -dependencies = [ - "async-trait", - "bytes", - "log", - "rand", - "rtcp", - "rtp 0.9.0", - "thiserror", - "tokio", - "waitgroup", - "webrtc-srtp", - "webrtc-util 0.8.1", -] - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -4910,7 +4781,7 @@ dependencies = [ "rustls 0.23.10", "rustls-webpki 0.101.7", "thiserror", - "x509-parser 0.16.0", + "x509-parser", "yasna", ] @@ -4929,34 +4800,6 @@ dependencies = [ "void", ] -[[package]] -name = "libp2p-webrtc" -version = "0.8.0-alpha" -source = "git+https://github.com/libp2p/rust-libp2p?rev=aa9317fbdd88cc4c9a39ea608fa1d57e022297fc#aa9317fbdd88cc4c9a39ea608fa1d57e022297fc" -dependencies = [ - "async-trait", - "bytes", - "futures", - "futures-timer", - "hex", - "if-watch", - "libp2p-core", - "libp2p-identity", - "libp2p-noise", - "libp2p-webrtc-utils", - "multihash 0.19.1", - "rand", - "rcgen", - "serde", - "stun 0.6.0", - "thiserror", - "tinytemplate", - "tokio", - "tokio-util", - "tracing", - "webrtc", -] - [[package]] name = "libp2p-webrtc-utils" version = "0.3.0" @@ -5278,16 +5121,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if 1.0.0", - "digest 0.10.7", -] - [[package]] name = "memchr" version = "2.7.4" @@ -5303,15 +5136,6 @@ dependencies = [ "rustix 0.38.34", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.8.0" @@ -5574,19 +5398,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset 0.7.1", - "pin-utils", -] - [[package]] name = "no-std-net" version = "0.6.0" @@ -5761,22 +5572,13 @@ dependencies = [ "memchr", ] -[[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.2", -] - [[package]] name = "oid-registry" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d" dependencies = [ - "asn1-rs 0.6.1", + "asn1-rs", ] [[package]] @@ -5875,30 +5677,6 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2 0.10.8", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2 0.10.8", -] - [[package]] name = "parity-scale-codec" version = "3.6.12" @@ -6053,15 +5831,6 @@ dependencies = [ "serde", ] -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -6218,12 +5987,6 @@ dependencies = [ "universal-hash", ] -[[package]] -name = "portable-atomic" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" - [[package]] name = "powerfmt" version = "0.2.0" @@ -6276,15 +6039,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - [[package]] name = "primitive-types" version = "0.12.2" @@ -6596,7 +6350,6 @@ dependencies = [ "pem", "ring 0.16.20", "time", - "x509-parser 0.15.1", "yasna", ] @@ -6787,17 +6540,6 @@ dependencies = [ "librocksdb-sys", ] -[[package]] -name = "rtcp" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33648a781874466a62d89e265fee9f17e32bc7d05a256e6cca41bf97eadcd8aa" -dependencies = [ - "bytes", - "thiserror", - "webrtc-util 0.8.1", -] - [[package]] name = "rtnetlink" version = "0.10.1" @@ -6808,37 +6550,11 @@ dependencies = [ "log", "netlink-packet-route", "netlink-proto", - "nix 0.24.3", + "nix", "thiserror", "tokio", ] -[[package]] -name = "rtp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e60482acbe8afb31edf6b1413103b7bca7a65004c423b3c3993749a083994fbe" -dependencies = [ - "bytes", - "rand", - "serde", - "thiserror", - "webrtc-util 0.8.1", -] - -[[package]] -name = "rtp" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47fca9bd66ae0b1f3f649b8f5003d6176433d7293b78b0fce7e1031816bdd99d" -dependencies = [ - "bytes", - "rand", - "serde", - "thiserror", - "webrtc-util 0.8.1", -] - [[package]] name = "rustc-demangle" version = "0.1.24" @@ -7307,18 +7023,6 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "sdp" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f" -dependencies = [ - "rand", - "substring", - "thiserror", - "url", -] - [[package]] name = "sec1" version = "0.7.3" @@ -7614,15 +7318,6 @@ dependencies = [ "futures-lite 2.3.0", ] -[[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde", -] - [[package]] name = "smoldot" version = "0.16.0" @@ -8451,44 +8146,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "stun" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f371788132e9d623e6eab4ba28aac083763a4133f045e6ebaee5ceb869803d" -dependencies = [ - "base64 0.21.7", - "crc", - "lazy_static", - "md-5", - "rand", - "ring 0.17.8", - "subtle", - "thiserror", - "tokio", - "url", - "webrtc-util 0.8.1", -] - -[[package]] -name = "stun" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fad383a1cc63ae141e84e48eaef44a1063e9d9e55bcb8f51a99b886486e01b" -dependencies = [ - "base64 0.21.7", - "crc", - "lazy_static", - "md-5", - "rand", - "ring 0.17.8", - "subtle", - "thiserror", - "tokio", - "url", - "webrtc-util 0.9.0", -] - [[package]] name = "substrate-bip39" version = "0.4.6" @@ -8502,15 +8159,6 @@ dependencies = [ "zeroize", ] -[[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.6.1" @@ -8709,18 +8357,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "synstructure" version = "0.13.1" @@ -8994,7 +8630,6 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", @@ -9406,33 +9041,13 @@ dependencies = [ "utf-8", ] -[[package]] -name = "turn" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb2ac4f331064513ad510b7a36edc0df555bd61672986607f7c9ff46f98f415" -dependencies = [ - "async-trait", - "base64 0.21.7", - "futures", - "log", - "md-5", - "rand", - "ring 0.17.8", - "stun 0.5.1", - "thiserror", - "tokio", - "tokio-util", - "webrtc-util 0.8.1", -] - [[package]] name = "twox-hash" version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "digest 0.10.7", "rand", "static_assertions", @@ -9679,15 +9294,6 @@ dependencies = [ "libc", ] -[[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.2.0" @@ -9975,7 +9581,7 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.8.0", + "memoffset", "paste", "rand", "rustix 0.36.17", @@ -10032,230 +9638,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webrtc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91e7cf018f7185552bf6a5dd839f4ed9827aea33b746763c9a215f84a0d0b34" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "cfg-if 1.0.0", - "hex", - "interceptor", - "lazy_static", - "log", - "rand", - "rcgen", - "regex", - "ring 0.16.20", - "rtcp", - "rtp 0.9.0", - "rustls 0.21.12", - "sdp", - "serde", - "serde_json", - "sha2 0.10.8", - "smol_str", - "stun 0.5.1", - "thiserror", - "time", - "tokio", - "turn", - "url", - "waitgroup", - "webrtc-data", - "webrtc-dtls", - "webrtc-ice", - "webrtc-mdns", - "webrtc-media", - "webrtc-sctp", - "webrtc-srtp", - "webrtc-util 0.8.1", -] - -[[package]] -name = "webrtc-data" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c08e648e10572b9edbe741074e0f4d3cb221aa7cdf9a814ee71606de312f33" -dependencies = [ - "bytes", - "log", - "thiserror", - "tokio", - "webrtc-sctp", - "webrtc-util 0.8.1", -] - -[[package]] -name = "webrtc-dtls" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b140b953f986e97828aa33ec6318186b05d862bee689efbc57af04a243e832" -dependencies = [ - "aes", - "aes-gcm", - "async-trait", - "bincode", - "byteorder", - "cbc", - "ccm", - "der-parser 8.2.0", - "hkdf", - "hmac 0.12.1", - "log", - "p256", - "p384", - "rand", - "rand_core", - "rcgen", - "ring 0.16.20", - "rustls 0.21.12", - "sec1", - "serde", - "sha1", - "sha2 0.10.8", - "subtle", - "thiserror", - "tokio", - "webrtc-util 0.8.1", - "x25519-dalek", - "x509-parser 0.15.1", -] - -[[package]] -name = "webrtc-ice" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1bbd6b3dea22cc6e961e22b012e843d8869e2ac8e76b96e54d4a25e311857ad" -dependencies = [ - "arc-swap", - "async-trait", - "crc", - "log", - "rand", - "serde", - "serde_json", - "stun 0.5.1", - "thiserror", - "tokio", - "turn", - "url", - "uuid", - "waitgroup", - "webrtc-mdns", - "webrtc-util 0.8.1", -] - -[[package]] -name = "webrtc-mdns" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce981f93104a8debb3563bb0cedfe4aa2f351fdf6b53f346ab50009424125c08" -dependencies = [ - "log", - "socket2 0.5.7", - "thiserror", - "tokio", - "webrtc-util 0.8.1", -] - -[[package]] -name = "webrtc-media" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280017b6b9625ef7329146332518b339c3cceff231cc6f6a9e0e6acab25ca4af" -dependencies = [ - "byteorder", - "bytes", - "rand", - "rtp 0.10.0", - "thiserror", -] - -[[package]] -name = "webrtc-sctp" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df75ec042002fe995194712cbeb2029107a60a7eab646f1b789eb1be94d0e367" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "crc", - "log", - "rand", - "thiserror", - "tokio", - "webrtc-util 0.8.1", -] - -[[package]] -name = "webrtc-srtp" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db1f36c1c81e4b1e531c0b9678ba0c93809e196ce62122d87259bb71c03b9f" -dependencies = [ - "aead", - "aes", - "aes-gcm", - "byteorder", - "bytes", - "ctr", - "hmac 0.12.1", - "log", - "rtcp", - "rtp 0.9.0", - "sha1", - "subtle", - "thiserror", - "tokio", - "webrtc-util 0.8.1", -] - -[[package]] -name = "webrtc-util" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e85154ef743d9a2a116d104faaaa82740a281b8b4bed5ee691a2df6c133d873" -dependencies = [ - "async-trait", - "bitflags 1.3.2", - "bytes", - "ipnet", - "lazy_static", - "libc", - "log", - "nix 0.26.4", - "rand", - "thiserror", - "tokio", - "winapi", -] - -[[package]] -name = "webrtc-util" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8d9bc631768958ed97b8d68b5d301e63054ae90b09083d43e2fefb939fd77e" -dependencies = [ - "async-trait", - "bitflags 1.3.2", - "bytes", - "ipnet", - "lazy_static", - "libc", - "log", - "nix 0.26.4", - "portable-atomic", - "rand", - "thiserror", - "tokio", - "winapi", -] - [[package]] name = "widestring" version = "1.1.0" @@ -10628,36 +10010,18 @@ dependencies = [ "zeroize", ] -[[package]] -name = "x509-parser" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" -dependencies = [ - "asn1-rs 0.5.2", - "data-encoding", - "der-parser 8.2.0", - "lazy_static", - "nom", - "oid-registry 0.6.1", - "ring 0.16.20", - "rusticata-macros", - "thiserror", - "time", -] - [[package]] name = "x509-parser" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" dependencies = [ - "asn1-rs 0.6.1", + "asn1-rs", "data-encoding", - "der-parser 9.0.0", + "der-parser", "lazy_static", "nom", - "oid-registry 0.7.0", + "oid-registry", "rusticata-macros", "thiserror", "time", diff --git a/Cargo.toml b/Cargo.toml index 87ad90ae7..89a8b8a60 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,6 @@ rand = { version = "0.8.5", default-features = false } # TODO: Replace with released libp2p version once webrtc-websys compilation issue is resolved libp2p = { git = "https://github.com/libp2p/rust-libp2p", rev = "aa9317fbdd88cc4c9a39ea608fa1d57e022297fc", features = ["kad", "identify", "ping", "mdns", "autonat", "relay", "dcutr", "upnp", "noise", "yamux", "dns", "metrics", "tokio", "macros", "tcp", "quic", "serde", "websocket"] } libp2p-allow-block-list = { git = "https://github.com/libp2p/rust-libp2p", rev = "aa9317fbdd88cc4c9a39ea608fa1d57e022297fc" } -libp2p-webrtc = { git = "https://github.com/libp2p/rust-libp2p", rev = "aa9317fbdd88cc4c9a39ea608fa1d57e022297fc" } libp2p-webrtc-websys = { git = "https://github.com/libp2p/rust-libp2p", rev = "aa9317fbdd88cc4c9a39ea608fa1d57e022297fc" } multihash = { version = "0.14.0", default-features = false, features = ["blake3", "sha3"] } semver = "1.0.23" diff --git a/bootstrap/CHANGELOG.md b/bootstrap/CHANGELOG.md index 58059d427..22d6802a9 100644 --- a/bootstrap/CHANGELOG.md +++ b/bootstrap/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [0.4.2](https://github.com/availproject/avail-light/releases/tag/avail-light-bootstrap-v0.4.2) - 2024-12-20 + +- Temporary remove WebRTC support to reduce memory usage + ## [0.4.1](https://github.com/availproject/avail-light/releases/tag/avail-light-bootstrap-v0.4.1) - 2024-11-29 - Update opentelemetry sdk version diff --git a/bootstrap/Cargo.toml b/bootstrap/Cargo.toml index 88f353c31..1195d661d 100644 --- a/bootstrap/Cargo.toml +++ b/bootstrap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avail-light-bootstrap" -version = "0.4.1" +version = "0.4.2" build = "../build.rs" edition = "2021" description = "Avail network Bootstrap Node for p2p Light Client" @@ -14,12 +14,11 @@ confy = { workspace = true } hex = { workspace = true } libp2p = { workspace = true } libp2p-allow-block-list = { workspace = true } -libp2p-webrtc = { workspace = true, features = ["tokio"] } multihash = { workspace = true } rand = { workspace = true } semver = { workspace = true } serde = { workspace = true } -tokio = { workspace = true } +tokio = { workspace = true, features = ["signal"] } tracing = { workspace = true } tracing-subscriber = { workspace = true } void = { workspace = true } diff --git a/bootstrap/src/main.rs b/bootstrap/src/main.rs index 194a7968d..dc3131e7c 100644 --- a/bootstrap/src/main.rs +++ b/bootstrap/src/main.rs @@ -135,11 +135,6 @@ async fn run() -> Result<()> { info!("TCP listener started on port {}.", cfg.port); - network_client - .start_listening(webrtc_multiaddress(cfg.webrtc_port)) - .await - .context("Unable to create WebRTC P2P listener.")?; - info!("WebRTC listening on port {}.", cfg.webrtc_port); info!("Bootstrap node starting ..."); @@ -178,9 +173,3 @@ fn construct_multiaddress(is_websocket: bool, port: u16) -> Multiaddr { tcp_multiaddress } - -fn webrtc_multiaddress(webrtc_port: u16) -> Multiaddr { - Multiaddr::from(Ipv4Addr::UNSPECIFIED) - .with(Protocol::Udp(webrtc_port)) - .with(Protocol::WebRTCDirect) -} diff --git a/bootstrap/src/p2p.rs b/bootstrap/src/p2p.rs index 74c589d52..2538375ad 100644 --- a/bootstrap/src/p2p.rs +++ b/bootstrap/src/p2p.rs @@ -8,9 +8,7 @@ use libp2p::{ swarm::NetworkBehaviour, tcp, yamux, PeerId, SwarmBuilder, }; -use libp2p_webrtc as webrtc; use multihash::Hasher; -use rand::thread_rng; use tokio::sync::mpsc; mod client; @@ -105,11 +103,6 @@ pub async fn init( noise::Config::new, yamux::Config::default, )? - .with_other_transport(|keypair| { - use webrtc::tokio::{Certificate, Transport}; - let certificate = Certificate::generate(&mut thread_rng()); - Ok(Transport::new(keypair.clone(), certificate?)) - })? .with_dns()? .with_behaviour(behaviour)? .with_swarm_config(|c| generate_config(c, cfg)) diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md index 3a9c23347..373517a36 100644 --- a/client/CHANGELOG.md +++ b/client/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 1.12.4 +## [1.12.4](https://github.com/availproject/avail-light/releases/tag/avail-light-client-v1.12.4) - 2024-12-20 - Update `avail-light-core` to 1.1.0 diff --git a/client/src/main.rs b/client/src/main.rs index 5da2aeb79..c60e0ae31 100644 --- a/client/src/main.rs +++ b/client/src/main.rs @@ -94,20 +94,14 @@ async fn run( spawn_in_span(shutdown.with_cancel(p2p_event_loop.run())); - let addrs = vec![ - cfg.libp2p.tcp_multiaddress(), - cfg.libp2p.webrtc_multiaddress(), - ]; + let addrs = vec![cfg.libp2p.tcp_multiaddress()]; // Start the TCP and WebRTC listeners p2p_client .start_listening(addrs) .await .wrap_err("Error starting listener.")?; - info!( - "TCP listener started on port {}. WebRTC listening on port {}.", - cfg.libp2p.port, cfg.libp2p.webrtc_port - ); + info!("TCP listener started on port {}", cfg.libp2p.port); let p2p_clone = p2p_client.to_owned(); let cfg_clone = cfg.to_owned(); diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index e7b62fa03..02ab55f71 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog -## 1.1.0 +## [1.1.0](https://github.com/availproject/avail-light/tree/avail-light-core-v1.1.0) - 2024-12-20 +- Temporary remove WebRTC support to reduce memory usage - Update opentelemetry sdk version to 0.27.1 - Enable WASM compilation of the network, light_client and related mods diff --git a/core/Cargo.toml b/core/Cargo.toml index 0f7cedd05..d4e4c19c8 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -35,7 +35,6 @@ smallvec = "1.6.1" strip-ansi-escapes = "0.2.0" strum = { version = "0.26.3", features = ["derive"] } sysinfo = "0.30.12" -tokio = { workspace = true } tokio-retry = "0.3" tokio-stream = { workspace = true } tracing = { workspace = true } @@ -50,7 +49,6 @@ hyper = { version = "0.14.23", features = ["full", "http1"] } jsonrpsee-core = { version = "0.21.0", features = ["client"] } libc = "0.2.150" libp2p = { workspace = true } -libp2p-webrtc = { workspace = true, features = ["tokio"] } multihash = { workspace = true } num = "0.4.0" num_cpus = "1.13.0" @@ -61,6 +59,7 @@ rocksdb = { version = "0.21.0", features = ["snappy", "multi-threaded-cf"], opti strip-ansi-escapes = "0.2.0" thiserror = "1.0.64" threadpool = "1.8.1" +tokio = { workspace = true, features = ["signal"] } tokio-util = "0.7.10" tracing = { workspace = true } tracing-subscriber = { workspace = true } @@ -82,6 +81,7 @@ libp2p = { workspace = true, features = ["wasm-bindgen"] } libp2p-webrtc-websys = { workspace = true } rand = { workspace = true, features = ["std_rng"] } thiserror-no-std = "2.0.2" +tokio = { workspace = true } tokio_with_wasm = { version = "0.7.1", default-features = false, features = ["sync", "macros", "rt", "time"] } wasm-bindgen = "0.2.90" web-time = "1.1.0" diff --git a/core/src/network/p2p.rs b/core/src/network/p2p.rs index 4cc8a1746..b384e0c4d 100644 --- a/core/src/network/p2p.rs +++ b/core/src/network/p2p.rs @@ -15,11 +15,7 @@ use libp2p::{ #[cfg(not(target_arch = "wasm32"))] use libp2p::{mdns, tcp, upnp}; #[cfg(not(target_arch = "wasm32"))] -use libp2p_webrtc as webrtc; -#[cfg(not(target_arch = "wasm32"))] use multihash::{self, Hasher}; -#[cfg(not(target_arch = "wasm32"))] -use rand::thread_rng; use semver::Version; use serde::{Deserialize, Serialize}; #[cfg(not(target_arch = "wasm32"))] @@ -340,11 +336,6 @@ async fn build_swarm( noise::Config::new, yamux::Config::default, )? - .with_other_transport(|keypair| { - use webrtc::tokio::{Certificate, Transport}; - let certificate = Certificate::generate(&mut thread_rng()); - Ok(Transport::new(keypair.clone(), certificate?)) - })? .with_dns()? .with_relay_client(noise::Config::new, yamux::Config::default)? .with_behaviour(behaviour)? diff --git a/fat/CHANGELOG.md b/fat/CHANGELOG.md index 101c9fbb4..1127e213f 100644 --- a/fat/CHANGELOG.md +++ b/fat/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 1.12.3 +## [1.12.3](https://github.com/availproject/avail-light/releases/tag/avail-light-fat-v1.12.3) - 2024-12-20 - Update `avail-light-core` to 1.1.0