From 046df55c8999ee8ece38ec90ac399f1f3bf0ece7 Mon Sep 17 00:00:00 2001 From: Andre-Philippe Paquet Date: Sat, 31 Aug 2024 13:53:52 -0400 Subject: [PATCH] Bump deps --- Cargo.lock | 198 +++++++++++++++------------------ Cargo.toml | 4 + apps/macros/Cargo.toml | 4 +- apps/sdk/Cargo.toml | 4 +- chain/Cargo.toml | 4 +- clients/c/Cargo.toml | 2 +- core/Cargo.toml | 12 +- discovery/Cargo.toml | 8 +- exo/Cargo.toml | 8 +- protos/Cargo.toml | 6 +- store/Cargo.toml | 8 +- transport/Cargo.toml | 6 +- transport/src/p2p/behaviour.rs | 3 +- 13 files changed, 125 insertions(+), 142 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd010d690..ef39caffd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -241,7 +241,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "synstructure", ] @@ -253,7 +253,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -300,20 +300,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", -] - -[[package]] -name = "asynchronous-codec" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" -dependencies = [ - "bytes", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite", + "syn 2.0.77", ] [[package]] @@ -384,12 +371,6 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -825,7 +806,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1239,7 +1220,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1411,7 +1392,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1478,7 +1459,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1621,7 +1602,7 @@ dependencies = [ "futures", "log", "quote", - "syn 2.0.76", + "syn 2.0.77", "thiserror", ] @@ -2088,7 +2069,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2907,16 +2888,15 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libp2p" -version = "0.53.2" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681fb3f183edfbedd7a57d32ebe5dcdc0b9f94061185acf3c30249349cc6fc99" +checksum = "bbbe80f9c7e00526cd6b838075b9c171919404a4732cb2fa8ece0a093223bfc4" dependencies = [ "bytes", "either", "futures", "futures-timer", "getrandom 0.2.15", - "instant", "libp2p-allow-block-list", "libp2p-connection-limits", "libp2p-core", @@ -2943,9 +2923,9 @@ dependencies = [ [[package]] name = "libp2p-allow-block-list" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107b238b794cb83ab53b74ad5dcf7cca3200899b72fe662840cfb52f5b0a32e6" +checksum = "d1027ccf8d70320ed77e984f273bc8ce952f623762cb9bf2d126df73caef8041" dependencies = [ "libp2p-core", "libp2p-identity", @@ -2955,9 +2935,9 @@ dependencies = [ [[package]] name = "libp2p-connection-limits" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cd50a78ccfada14de94cbacd3ce4b0138157f376870f13d3a8422cd075b4fd" +checksum = "8d003540ee8baef0d254f7b6bfd79bac3ddf774662ca0abf69186d517ef82ad8" dependencies = [ "libp2p-core", "libp2p-identity", @@ -2967,9 +2947,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.41.3" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a8920cbd8540059a01950c1e5c96ea8d89eb50c51cd366fc18bdf540a6e48f" +checksum = "a61f26c83ed111104cd820fe9bc3aaabbac5f1652a1d213ed6e900b7918a1298" dependencies = [ "either", "fnv", @@ -2995,9 +2975,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.41.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17cbcf7160ff35c3e8e560de4a068fe9d6cb777ea72840e48eb76ff9576c4b6" +checksum = "97f37f30d5c7275db282ecd86e54f29dd2176bd3ac656f06abf43bedb21eb8bd" dependencies = [ "async-trait", "futures", @@ -3011,12 +2991,12 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.46.1" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d665144a616dadebdc5fff186b1233488cdcd8bfb1223218ff084b6d052c94f7" +checksum = "b4e830fdf24ac8c444c12415903174d506e1e077fbe3875c404a78c5935a8543" dependencies = [ - "asynchronous-codec 0.7.0", - "base64 0.21.7", + "asynchronous-codec", + "base64 0.22.1", "byteorder", "bytes", "either", @@ -3025,7 +3005,6 @@ dependencies = [ "futures-ticker", "getrandom 0.2.15", "hex_fmt", - "instant", "libp2p-core", "libp2p-identity", "libp2p-swarm", @@ -3038,15 +3017,16 @@ dependencies = [ "smallvec", "tracing", "void", + "web-time", ] [[package]] name = "libp2p-identify" -version = "0.44.2" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d635ebea5ca0c3c3e77d414ae9b67eccf2a822be06091b9c1a0d13029a1e2f" +checksum = "1711b004a273be4f30202778856368683bd9a83c4c7dcc8f848847606831a4e3" dependencies = [ - "asynchronous-codec 0.7.0", + "asynchronous-codec", "either", "futures", "futures-bounded", @@ -3085,9 +3065,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.45.1" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49007d9a339b3e1d7eeebc4d67c05dbf23d300b7d091193ec2d3f26802d7faf2" +checksum = "14b8546b6644032565eb29046b42744aee1e9f261ed99671b2c93fb140dba417" dependencies = [ "data-encoding", "futures", @@ -3106,12 +3086,11 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdac91ae4f291046a3b2660c039a2830c931f84df2ee227989af92f7692d3357" +checksum = "77ebafa94a717c8442d8db8d3ae5d1c6a15e30f2d347e0cd31d057ca72e42566" dependencies = [ "futures", - "instant", "libp2p-core", "libp2p-identify", "libp2p-identity", @@ -3119,15 +3098,16 @@ dependencies = [ "libp2p-swarm", "pin-project", "prometheus-client", + "web-time", ] [[package]] name = "libp2p-mplex" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e895765e27e30217b25f7cb7ac4686dad1ff80bf2fdeffd1d898566900a924" +checksum = "41187ab8f6c835ad864edf94224f666f636ee2d270601422c1441f739e0abccc" dependencies = [ - "asynchronous-codec 0.6.2", + "asynchronous-codec", "bytes", "futures", "libp2p-core", @@ -3137,16 +3117,16 @@ dependencies = [ "rand 0.8.5", "smallvec", "tracing", - "unsigned-varint 0.7.2", + "unsigned-varint 0.8.0", ] [[package]] name = "libp2p-noise" -version = "0.44.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecd0545ce077f6ea5434bcb76e8d0fe942693b4380aaad0d34a358c2bd05793" +checksum = "36b137cb1ae86ee39f8e5d6245a296518912014eaa87427d24e6ff58cfc1b28c" dependencies = [ - "asynchronous-codec 0.7.0", + "asynchronous-codec", "bytes", "curve25519-dalek", "futures", @@ -3168,27 +3148,27 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.44.1" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1de5a6cf64fba7f7e8f2102711c9c6c043a8e56b86db8cd306492c517da3fb3" +checksum = "005a34420359223b974ee344457095f027e51346e992d1e0dcd35173f4cdd422" dependencies = [ "either", "futures", "futures-timer", - "instant", "libp2p-core", "libp2p-identity", "libp2p-swarm", "rand 0.8.5", "tracing", "void", + "web-time", ] [[package]] name = "libp2p-quic" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67296ad4e092e23f92aea3d2bdb6f24eab79c0929ed816dfb460ea2f4567d2b" +checksum = "46352ac5cd040c70e88e7ff8257a2ae2f891a4076abad2c439584a31c15fd24e" dependencies = [ "bytes", "futures", @@ -3210,16 +3190,15 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.44.2" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80cae6cb75f89dbca53862f9ebe0b9f463aa7b302762fcfaafb9e51dcc9b0f7e" +checksum = "d7dd6741793d2c1fb2088f67f82cf07261f25272ebe3c0b0c311e0c6b50e851a" dependencies = [ "either", "fnv", "futures", "futures-timer", "getrandom 0.2.15", - "instant", "libp2p-core", "libp2p-identity", "libp2p-swarm-derive", @@ -3232,25 +3211,26 @@ dependencies = [ "tracing", "void", "wasm-bindgen-futures", + "web-time", ] [[package]] name = "libp2p-swarm-derive" -version = "0.34.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5daceb9dd908417b6dfcfe8e94098bc4aac54500c282e78120b885dadc09b999" +checksum = "206e0aa0ebe004d778d79fb0966aa0de996c19894e2c0605ba2f8524dd4443d8" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "libp2p-tcp" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2460fc2748919adff99ecbc1aab296e4579e41f374fb164149bd2c9e529d4c" +checksum = "ad964f312c59dcfcac840acd8c555de8403e295d39edf96f5240048b5fcaa314" dependencies = [ "futures", "futures-timer", @@ -3265,9 +3245,9 @@ dependencies = [ [[package]] name = "libp2p-tls" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b7b831e55ce2aa6c354e6861a85fdd4dd0a2b97d5e276fabac0e4810a71776" +checksum = "47b23dddc2b9c355f73c1e36eb0c3ae86f7dc964a3715f0731cfad352db4d847" dependencies = [ "futures", "futures-rustls", @@ -3284,9 +3264,9 @@ dependencies = [ [[package]] name = "libp2p-upnp" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccf04b0e3ff3de52d07d5fd6c3b061d0e7f908ffc683c32d9638caedce86fc8" +checksum = "01bf2d1b772bd3abca049214a3304615e6a36fa6ffc742bdd1ba774486200b8f" dependencies = [ "futures", "futures-timer", @@ -3300,9 +3280,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.43.2" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b953b6803a1f3161a989538974d72511c4e48a4af355337b6fb90723c56c05" +checksum = "888b2ff2e5d8dcef97283daab35ad1043d18952b65e05279eecbe02af4c6e347" dependencies = [ "either", "futures", @@ -3321,9 +3301,9 @@ dependencies = [ [[package]] name = "libp2p-websocket-websys" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95cd8a32fcf94ad1e5c2de37c2a05a5a4188d8358b005859a0fc9e63b6953bc" +checksum = "38cf9b429dd07be52cd82c4c484b1694df4209210a7db3b9ffb00c7606e230c8" dependencies = [ "bytes", "futures", @@ -3339,9 +3319,9 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.45.2" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd5265f6b80f94d48a3963541aad183cc598a645755d2f1805a373e41e0716b" +checksum = "788b61c80789dba9760d8c669a5bedb642c8267555c803fabd8396e4ca5c5882" dependencies = [ "either", "futures", @@ -3715,7 +3695,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "synstructure", ] @@ -4092,7 +4072,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4189,7 +4169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4255,7 +4235,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4285,7 +4265,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.76", + "syn 2.0.77", "tempfile", ] @@ -4299,7 +4279,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4372,7 +4352,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474" dependencies = [ - "asynchronous-codec 0.7.0", + "asynchronous-codec", "bytes", "quick-protobuf", "thiserror", @@ -4942,7 +4922,7 @@ checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5224,9 +5204,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -5250,14 +5230,13 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "system-configuration" version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +source = "git+https://github.com/tmpfs/system-configuration-rs?rev=572913bf0c74ed996b2beeac3d61ed681075cbd4#572913bf0c74ed996b2beeac3d61ed681075cbd4" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -5267,8 +5246,7 @@ dependencies = [ [[package]] name = "system-configuration-sys" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +source = "git+https://github.com/tmpfs/system-configuration-rs?rev=572913bf0c74ed996b2beeac3d61ed681075cbd4#572913bf0c74ed996b2beeac3d61ed681075cbd4" dependencies = [ "core-foundation-sys", "libc", @@ -5431,7 +5409,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5504,9 +5482,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -5526,7 +5504,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5626,7 +5604,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5731,16 +5709,16 @@ name = "unsigned-varint" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" -dependencies = [ - "asynchronous-codec 0.6.2", - "bytes", -] [[package]] name = "unsigned-varint" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" +dependencies = [ + "asynchronous-codec", + "bytes", +] [[package]] name = "untrusted" @@ -5921,7 +5899,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -5955,7 +5933,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6814,7 +6792,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -6834,7 +6812,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6cb17623a..c6e0ac039 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,3 +81,7 @@ lto = "thin" [profile.release] debug = true + +[patch.crates-io] +# See https://github.com/mullvad/system-configuration-rs/issues/41 +system-configuration = { git = "https://github.com/tmpfs/system-configuration-rs", rev = "572913bf0c74ed996b2beeac3d61ed681075cbd4"} diff --git a/apps/macros/Cargo.toml b/apps/macros/Cargo.toml index d13b10596..a652d3455 100644 --- a/apps/macros/Cargo.toml +++ b/apps/macros/Cargo.toml @@ -16,6 +16,6 @@ proc-macro = true anyhow = "1.0.86" futures = "0.3.30" log = "0.4.22" -quote = "1.0.36" -syn = { version = "2.0.75", features = ["full", "fold"] } +quote = "1.0.37" +syn = { version = "2.0.77", features = ["full", "fold"] } thiserror = "1.0.63" diff --git a/apps/sdk/Cargo.toml b/apps/sdk/Cargo.toml index 18423c55b..fe6af41fd 100644 --- a/apps/sdk/Cargo.toml +++ b/apps/sdk/Cargo.toml @@ -17,9 +17,9 @@ exocore-store = {version = "0.1.25", path = "../../store", default-features = fa futures = "0.3.30" lazy_static = "1.5.0" log = "0.4.22" -quote = "1.0.36" +quote = "1.0.37" thiserror = "1.0.63" chrono = { version = "0.4.38", default-features = false, features = [] } [dev-dependencies] -tokio = { version = "1.39.3", features = ["macros"], default-features = false } +tokio = { version = "1.40.0", features = ["macros"], default-features = false } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index f2f84c0a8..461c2ddd6 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -26,7 +26,7 @@ exocore-transport = {version = "0.1.25", path = "../transport", default-features futures = "0.3.30" itertools = "0.13.0" log = "0.4.22" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } thiserror = "1.0.63" bytes = "1.7.1" @@ -41,7 +41,7 @@ tempfile = { version = "3.12.0", optional = true } exocore-core = {version = "0.1.25", path = "../core", features = ["tests-utils"]} exocore-transport = {version = "0.1.25", path = "../transport", features = ["tests-utils"]} tempfile = "3.12.0" -tokio = { version = "1.39.3", features = ["macros"], default-features = false } +tokio = { version = "1.40.0", features = ["macros"], default-features = false } [[test]] name = "engine" diff --git a/clients/c/Cargo.toml b/clients/c/Cargo.toml index ed64e3775..efa3a48d2 100644 --- a/clients/c/Cargo.toml +++ b/clients/c/Cargo.toml @@ -19,4 +19,4 @@ futures = "0.3.30" libc = "0.2.158" log = "0.4.22" log4rs = "1.3.0" -serde_json = "1.0.125" +serde_json = "1.0.127" diff --git a/core/Cargo.toml b/core/Cargo.toml index 573e022d4..c886a14ec 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -35,7 +35,7 @@ bytes = "1.7.1" chrono = "0.4.38" exocore-protos = {version = "0.1.25", path = "../protos"} futures = { version = "0.3.30", features = ["async-await"] } -libp2p = { version = "0.53.2", features = ["noise", "secp256k1"], default-features = false } +libp2p = { version = "0.54.1", features = ["noise", "secp256k1"], default-features = false } libp2p-identity = { version = "0.2.9", features = ["secp256k1", "ed25519"], default-features = false } log = "0.4.22" log4rs = { version = "1.3.0", optional = true } @@ -44,9 +44,9 @@ multihash-codetable = {version="0.1.3", features=["sha3"]} multihash-derive = {version="0.9"} petname = "1.1.3" rand = "0.8" -serde = "1.0.208" -serde_derive = "1.0.208" -serde_json = "1.0.125" +serde = "1.0.209" +serde_derive = "1.0.209" +serde_json = "1.0.127" serde_yaml = "0.9.34" shadow-rs = { version = "0.27.1", default-features = false } thiserror = "1.0.63" @@ -64,7 +64,7 @@ wasm-bindgen-futures = "0.4.43" chrono = { version = "0.4.38", default-features = false, features = [] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -tokio = { version = "1.39.3", features = ["rt"], default-features = false } +tokio = { version = "1.40.0", features = ["rt"], default-features = false } [build-dependencies] shadow-rs = { version = "0.27.1", default-features = false } @@ -73,7 +73,7 @@ shadow-rs = { version = "0.27.1", default-features = false } criterion_bencher_compat = "0.4.0" log4rs = "1.3.0" tempfile = "3.12.0" -tokio = { version = "1.39.3", features = ["macros", "rt", "rt-multi-thread", "time"], default-features = false } +tokio = { version = "1.40.0", features = ["macros", "rt", "rt-multi-thread", "time"], default-features = false } [[bench]] harness = false diff --git a/discovery/Cargo.toml b/discovery/Cargo.toml index d7bb717a2..9b9e57af9 100644 --- a/discovery/Cargo.toml +++ b/discovery/Cargo.toml @@ -21,15 +21,15 @@ futures = "0.3.30" log = "0.4.22" rand = "0.8" reqwest = { version = "0.12.7", default-features = false, features = ["json", "rustls-tls"] } -serde = "1.0.208" -serde_derive = "1.0.208" -serde_json = "1.0.125" +serde = "1.0.209" +serde_derive = "1.0.209" +serde_json = "1.0.127" thiserror = "1.0.63" wasm-timer = "0.2.5" # For server hyper = { version = "0.14.30", features = ["full"], optional = true } -tokio = { version = "1.39.3", default-features = false, features = ["macros", "time"], optional = true } +tokio = { version = "1.40.0", default-features = false, features = ["macros", "time"], optional = true } [[test]] name = "discovery" diff --git a/exo/Cargo.toml b/exo/Cargo.toml index 589fbf015..608b8933c 100644 --- a/exo/Cargo.toml +++ b/exo/Cargo.toml @@ -29,11 +29,11 @@ log = "0.4.22" log4rs = "1.3.0" rand = "0.8" reqwest = { version = "0.12.7", default-features = false, features = ["rustls-tls"] } -serde = "1.0.208" -serde_derive = "1.0.208" -serde_json = "1.0.125" +serde = "1.0.209" +serde_derive = "1.0.209" +serde_json = "1.0.127" tempfile = "3.12.0" thiserror = "1.0.63" -tokio = { version = "1.39.3", features = ["macros"], default-features = false } +tokio = { version = "1.40.0", features = ["macros"], default-features = false } url = "2.5.2" zip = { version = "0.6.6", features = ["deflate"], default-features = false } diff --git a/protos/Cargo.toml b/protos/Cargo.toml index 12cf20497..6e80fb8b3 100644 --- a/protos/Cargo.toml +++ b/protos/Cargo.toml @@ -17,9 +17,9 @@ chrono = "0.4.38" prost = "0.12.6" prost-types = "0.12.6" protobuf = "3.5.1" -serde = "1.0.208" -serde_derive = "1.0.208" -serde_json = "1.0.125" +serde = "1.0.209" +serde_derive = "1.0.209" +serde_json = "1.0.127" thiserror = "1.0.63" [build-dependencies] diff --git a/store/Cargo.toml b/store/Cargo.toml index 79a1381d0..943cc389f 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -49,13 +49,13 @@ byteorder = {version = "1.5.0", optional = true} crc = {version = "3.2.1", optional = true} extsort = {version = "0.4.2", optional = true} lru = {version = "0.12.4", optional = true} -serde = {version = "1.0.208", optional = true} -serde_derive = {version = "1.0.208", optional = true} -serde_json = {version = "1.0.125", optional = true} +serde = {version = "1.0.209", optional = true} +serde_derive = {version = "1.0.209", optional = true} +serde_json = {version = "1.0.127", optional = true} tantivy = {version = "0.19.2", optional = true} [dev-dependencies] exocore-chain = {version = "0.1.25", path = "../chain", features = ["tests-utils"]} exocore-core = {version = "0.1.25", path = "../core", features = ["tests-utils"]} tempfile = "3.12.0" -tokio = {version = "1.39.3", features = ["macros"], default-features = false} +tokio = {version = "1.40.0", features = ["macros"], default-features = false} diff --git a/transport/Cargo.toml b/transport/Cargo.toml index 9ae39ebb1..c9ef7ede3 100644 --- a/transport/Cargo.toml +++ b/transport/Cargo.toml @@ -25,9 +25,9 @@ exocore-core = {version = "0.1.25", path = "../core"} exocore-protos = {version = "0.1.25", path = "../protos"} futures = "0.3.30" hyper = {version = "0.14.30", features = ["full"], optional = true} -libp2p = {version = "0.53.2", optional = true, default-features = false, features = ["noise", "websocket", "yamux", "ping", "identify", "macros", "tokio", "dns"]} +libp2p = {version = "0.54.1", optional = true, default-features = false, features = ["noise", "websocket", "yamux", "ping", "identify", "macros", "tokio", "dns"]} libp2p-identity = { version = "0.2.9", features = ["secp256k1", "ed25519"], default-features = false } -libp2p-mplex = {version = "0.41.0", optional = true} +libp2p-mplex = {version = "0.42.0", optional = true} log = "0.4.22" pin-project = "1.1.5" thiserror = "1.0.63" @@ -35,4 +35,4 @@ url = {version = "2.5.2", optional = true} [dev-dependencies] exocore-core = {version = "0.1.25", path = "../core", features = ["tests-utils"]} -tokio = {version = "1.39.3", features = ["macros"], default-features = false} +tokio = {version = "1.40.0", features = ["macros"], default-features = false} diff --git a/transport/src/p2p/behaviour.rs b/transport/src/p2p/behaviour.rs index d554c18c4..5b76f1169 100644 --- a/transport/src/p2p/behaviour.rs +++ b/transport/src/p2p/behaviour.rs @@ -6,7 +6,7 @@ use std::{ use exocore_core::{cell::Node, time::Instant}; use futures::task::{Context, Poll}; use libp2p::{ - core::Multiaddr, + core::{transport::PortUse, Multiaddr}, swarm::{ dial_opts::{DialOpts, PeerCondition}, CloseConnection, ConnectionId, FromSwarm, NetworkBehaviour, NotifyHandler, THandler, @@ -243,6 +243,7 @@ impl NetworkBehaviour for ExocoreBehaviour { peer: PeerId, _addr: &Multiaddr, _role_override: libp2p::core::Endpoint, + _port_use: PortUse, ) -> Result, libp2p::swarm::ConnectionDenied> { self.mark_peer_connected(&peer); Ok(ExocoreProtoHandler::default())