diff --git a/Cargo.lock b/Cargo.lock index 0b877019..4ed58246 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1219,6 +1219,15 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + [[package]] name = "cpp_demangle" version = "0.3.5" @@ -4201,7 +4210,7 @@ dependencies = [ "bytes 1.1.0", "futures 0.3.21", "lazy_static", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-deflate", "libp2p-dns", "libp2p-floodsub", @@ -4222,10 +4231,10 @@ dependencies = [ "libp2p-swarm-derive", "libp2p-tcp", "libp2p-uds", - "libp2p-wasm-ext", + "libp2p-wasm-ext 0.30.0", "libp2p-websocket", "libp2p-yamux", - "multiaddr", + "multiaddr 0.13.0", "parking_lot 0.11.2", "pin-project 1.0.10", "smallvec", @@ -4249,16 +4258,16 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "multiaddr", + "multiaddr 0.13.0", "multihash 0.14.0", - "multistream-select", + "multistream-select 0.10.4", "parking_lot 0.11.2", "pin-project 1.0.10", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "rand 0.8.5", "ring", - "rw-stream-sink", + "rw-stream-sink 0.2.1", "sha2 0.9.9", "smallvec", "thiserror", @@ -4267,6 +4276,39 @@ dependencies = [ "zeroize", ] +[[package]] +name = "libp2p-core" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799676bb0807c788065e57551c6527d461ad572162b0519d1958946ff9e0539d" +dependencies = [ + "asn1_der", + "bs58", + "ed25519-dalek", + "either", + "fnv", + "futures 0.3.21", + "futures-timer", + "instant", + "lazy_static", + "log", + "multiaddr 0.14.0", + "multihash 0.16.3", + "multistream-select 0.12.0", + "parking_lot 0.12.0", + "pin-project 1.0.10", + "prost 0.11.0", + "prost-build 0.11.1", + "rand 0.8.5", + "rw-stream-sink 0.3.0", + "sha2 0.10.2", + "smallvec", + "thiserror", + "unsigned-varint 0.7.1", + "void", + "zeroize", +] + [[package]] name = "libp2p-deflate" version = "0.30.0" @@ -4275,7 +4317,7 @@ checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" dependencies = [ "flate2", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", ] [[package]] @@ -4286,7 +4328,7 @@ checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" dependencies = [ "async-std-resolver", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "log", "smallvec", "trust-dns-resolver", @@ -4301,11 +4343,11 @@ dependencies = [ "cuckoofilter", "fnv", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "rand 0.7.3", "smallvec", ] @@ -4323,11 +4365,11 @@ dependencies = [ "fnv", "futures 0.3.21", "hex_fmt", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "rand 0.7.3", "regex", "sha2 0.9.9", @@ -4343,12 +4385,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd" dependencies = [ "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-swarm", "log", "lru 0.6.6", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "smallvec", "wasm-timer", ] @@ -4365,11 +4407,11 @@ dependencies = [ "either", "fnv", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "rand 0.7.3", "sha2 0.9.9", "smallvec", @@ -4391,7 +4433,7 @@ dependencies = [ "futures 0.3.21", "if-watch", "lazy_static", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-swarm", "log", "rand 0.8.5", @@ -4406,7 +4448,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4af432fcdd2f8ba4579b846489f8f0812cfd738ced2c0af39df9b1c48bbb6ab2" dependencies = [ - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-identify", "libp2p-kad", "libp2p-ping", @@ -4423,7 +4465,7 @@ dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "log", "nohash-hasher", "parking_lot 0.11.2", @@ -4442,10 +4484,10 @@ dependencies = [ "curve25519-dalek 3.2.0", "futures 0.3.21", "lazy_static", - "libp2p-core", + "libp2p-core 0.30.2", "log", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "rand 0.8.5", "sha2 0.9.9", "snow", @@ -4461,7 +4503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf" dependencies = [ "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-swarm", "log", "rand 0.7.3", @@ -4478,10 +4520,10 @@ dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "log", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "unsigned-varint 0.7.1", "void", ] @@ -4510,12 +4552,12 @@ dependencies = [ "bytes 1.1.0", "futures 0.3.21", "futures-timer", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-swarm", "log", "pin-project 1.0.10", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "rand 0.7.3", "smallvec", "unsigned-varint 0.7.1", @@ -4532,11 +4574,11 @@ dependencies = [ "asynchronous-codec 0.6.0", "bimap", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-swarm", "log", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "rand 0.8.5", "sha2 0.9.9", "thiserror", @@ -4554,7 +4596,7 @@ dependencies = [ "async-trait", "bytes 1.1.0", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "libp2p-swarm", "log", "lru 0.7.5", @@ -4572,7 +4614,7 @@ checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" dependencies = [ "either", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "log", "rand 0.7.3", "smallvec", @@ -4602,7 +4644,7 @@ dependencies = [ "if-watch", "ipnet", "libc", - "libp2p-core", + "libp2p-core 0.30.2", "log", "socket2 0.4.4", ] @@ -4615,7 +4657,7 @@ checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" dependencies = [ "async-std", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "log", ] @@ -4627,7 +4669,21 @@ checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf" dependencies = [ "futures 0.3.21", "js-sys", - "libp2p-core", + "libp2p-core 0.30.2", + "parity-send-wrapper", + "wasm-bindgen", + "wasm-bindgen-futures", +] + +[[package]] +name = "libp2p-wasm-ext" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97" +dependencies = [ + "futures 0.3.21", + "js-sys", + "libp2p-core 0.37.0", "parity-send-wrapper", "wasm-bindgen", "wasm-bindgen-futures", @@ -4642,10 +4698,10 @@ dependencies = [ "either", "futures 0.3.21", "futures-rustls", - "libp2p-core", + "libp2p-core 0.30.2", "log", "quicksink", - "rw-stream-sink", + "rw-stream-sink 0.2.1", "soketto", "url 2.2.2", "webpki-roots 0.21.1", @@ -4658,7 +4714,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" dependencies = [ "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "parking_lot 0.11.2", "thiserror", "yamux", @@ -5083,6 +5139,24 @@ dependencies = [ "url 2.2.2", ] +[[package]] +name = "multiaddr" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +dependencies = [ + "arrayref", + "bs58", + "byteorder", + "data-encoding", + "multihash 0.16.3", + "percent-encoding 2.1.0", + "serde", + "static_assertions", + "unsigned-varint 0.7.1", + "url 2.2.2", +] + [[package]] name = "multibase" version = "0.8.0" @@ -5105,7 +5179,7 @@ dependencies = [ "blake3 0.3.8", "digest 0.9.0", "generic-array 0.14.5", - "multihash-derive", + "multihash-derive 0.7.2", "sha2 0.9.9", "sha3 0.9.1", "unsigned-varint 0.5.1", @@ -5119,11 +5193,24 @@ checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" dependencies = [ "digest 0.9.0", "generic-array 0.14.5", - "multihash-derive", + "multihash-derive 0.7.2", "sha2 0.9.9", "unsigned-varint 0.7.1", ] +[[package]] +name = "multihash" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +dependencies = [ + "core2", + "digest 0.10.3", + "multihash-derive 0.8.0", + "sha2 0.10.2", + "unsigned-varint 0.7.1", +] + [[package]] name = "multihash-derive" version = "0.7.2" @@ -5138,6 +5225,20 @@ dependencies = [ "synstructure", ] +[[package]] +name = "multihash-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "multimap" version = "0.8.3" @@ -5158,6 +5259,20 @@ dependencies = [ "unsigned-varint 0.7.1", ] +[[package]] +name = "multistream-select" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bc41247ec209813e2fd414d6e16b9d94297dacf3cd613fa6ef09cd4d9755c10" +dependencies = [ + "bytes 1.1.0", + "futures 0.3.21", + "log", + "pin-project 1.0.10", + "smallvec", + "unsigned-varint 0.7.1", +] + [[package]] name = "nalgebra" version = "0.27.1" @@ -5562,7 +5677,7 @@ dependencies = [ "futures 0.3.21", "jsonrpc-core", "jsonrpc-pubsub", - "libp2p-wasm-ext", + "libp2p-wasm-ext 0.37.0", "node-inspect", "node-primitives", "opportunity-runtime", @@ -8373,7 +8488,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes 1.1.0", - "prost-derive", + "prost-derive 0.9.0", +] + +[[package]] +name = "prost" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" +dependencies = [ + "bytes 1.1.0", + "prost-derive 0.11.0", ] [[package]] @@ -8389,8 +8514,28 @@ dependencies = [ "log", "multimap", "petgraph", - "prost", - "prost-types", + "prost 0.9.0", + "prost-types 0.9.0", + "regex", + "tempfile", + "which", +] + +[[package]] +name = "prost-build" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" +dependencies = [ + "bytes 1.1.0", + "heck 0.4.0", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prost 0.11.0", + "prost-types 0.11.1", "regex", "tempfile", "which", @@ -8409,6 +8554,19 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" version = "0.9.0" @@ -8416,7 +8574,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes 1.1.0", - "prost", + "prost 0.9.0", +] + +[[package]] +name = "prost-types" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" +dependencies = [ + "bytes 1.1.0", + "prost 0.11.0", ] [[package]] @@ -9007,6 +9175,17 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "rw-stream-sink" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" +dependencies = [ + "futures 0.3.21", + "pin-project 1.0.10", + "static_assertions", +] + [[package]] name = "ryu" version = "1.0.9" @@ -9054,8 +9233,8 @@ dependencies = [ "libp2p", "log", "parity-scale-codec", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "rand 0.7.3", "sc-client-api", "sc-network", @@ -9631,8 +9810,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.0", "pin-project 1.0.10", - "prost", - "prost-build", + "prost 0.9.0", + "prost-build 0.9.0", "rand 0.7.3", "sc-block-builder", "sc-client-api", diff --git a/node/opportunity/Cargo.toml b/node/opportunity/Cargo.toml index 54108180..73d17532 100644 --- a/node/opportunity/Cargo.toml +++ b/node/opportunity/Cargo.toml @@ -123,7 +123,7 @@ fp-evm = { version = "3.0.0-dev", default-features = false, git = "https://githu # WASM-specific dependencies wasm-bindgen = { version = "0.2.73", optional = true } wasm-bindgen-futures = { version = "0.4.18", optional = true } -libp2p-wasm-ext = { version = "0.30", features = ["websocket"], optional = true } +libp2p-wasm-ext = { version = "0.37", features = ["websocket"], optional = true } [dev-dependencies] sc-service-test = { version = "2.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19" }