diff --git a/Cargo.lock b/Cargo.lock index 0b877019..232c2b49 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1076,7 +1076,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768" dependencies = [ - "multibase", + "multibase 0.8.0", "multihash 0.13.2", "unsigned-varint 0.5.1", ] @@ -1191,6 +1191,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" +[[package]] +name = "const-oid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1219,6 +1225,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" @@ -1980,7 +1995,17 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" dependencies = [ - "const-oid", + "const-oid 0.7.1", +] + +[[package]] +name = "der" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" +dependencies = [ + "const-oid 0.9.1", + "zeroize", ] [[package]] @@ -2132,7 +2157,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" dependencies = [ - "der", + "der 0.5.1", "elliptic-curve", "signature", ] @@ -2174,12 +2199,12 @@ checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" dependencies = [ "base16ct", "crypto-bigint", - "der", + "der 0.5.1", "ff", "generic-array 0.14.5", "group", "rand_core 0.6.3", - "sec1", + "sec1 0.2.1", "subtle", "zeroize", ] @@ -3984,7 +4009,7 @@ dependencies = [ "cfg-if 1.0.0", "ecdsa", "elliptic-curve", - "sec1", + "sec1 0.2.1", ] [[package]] @@ -4201,7 +4226,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 +4247,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 +4274,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 +4292,40 @@ dependencies = [ "zeroize", ] +[[package]] +name = "libp2p-core" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" +dependencies = [ + "asn1_der", + "bs58", + "ed25519-dalek", + "either", + "fnv", + "futures 0.3.21", + "futures-timer", + "instant", + "log", + "multiaddr 0.16.0", + "multihash 0.16.3", + "multistream-select 0.12.1", + "once_cell", + "parking_lot 0.12.0", + "pin-project 1.0.10", + "prost 0.11.2", + "prost-build 0.11.2", + "rand 0.8.5", + "rw-stream-sink 0.3.0", + "sec1 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 +4334,7 @@ checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" dependencies = [ "flate2", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", ] [[package]] @@ -4286,7 +4345,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 +4360,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 +4382,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 +4402,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 +4424,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 +4450,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 +4465,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 +4482,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 +4501,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 +4520,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 +4537,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 +4569,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 +4591,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 +4613,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 +4631,7 @@ checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" dependencies = [ "either", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "log", "rand 0.7.3", "smallvec", @@ -4602,7 +4661,7 @@ dependencies = [ "if-watch", "ipnet", "libc", - "libp2p-core", + "libp2p-core 0.30.2", "log", "socket2 0.4.4", ] @@ -4615,7 +4674,7 @@ checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" dependencies = [ "async-std", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.30.2", "log", ] @@ -4627,7 +4686,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.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" +dependencies = [ + "futures 0.3.21", + "js-sys", + "libp2p-core 0.38.0", "parity-send-wrapper", "wasm-bindgen", "wasm-bindgen-futures", @@ -4642,10 +4715,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 +4731,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 +5156,24 @@ dependencies = [ "url 2.2.2", ] +[[package]] +name = "multiaddr" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "multibase 0.9.1", + "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" @@ -5094,6 +5185,17 @@ dependencies = [ "data-encoding-macro", ] +[[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.13.2" @@ -5105,7 +5207,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 +5221,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.1", + "sha2 0.10.2", + "unsigned-varint 0.7.1", +] + [[package]] name = "multihash-derive" version = "0.7.2" @@ -5138,6 +5253,20 @@ dependencies = [ "synstructure", ] +[[package]] +name = "multihash-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "multimap" version = "0.8.3" @@ -5158,6 +5287,20 @@ dependencies = [ "unsigned-varint 0.7.1", ] +[[package]] +name = "multistream-select" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" +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" @@ -5416,9 +5559,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.10.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "opaque-debug" @@ -5562,7 +5705,7 @@ dependencies = [ "futures 0.3.21", "jsonrpc-core", "jsonrpc-pubsub", - "libp2p-wasm-ext", + "libp2p-wasm-ext 0.38.0", "node-inspect", "node-primitives", "opportunity-runtime", @@ -7096,11 +7239,21 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" dependencies = [ - "der", - "spki", + "der 0.5.1", + "spki 0.5.4", "zeroize", ] +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der 0.6.0", + "spki 0.6.0", +] + [[package]] name = "pkg-config" version = "0.3.25" @@ -8277,6 +8430,16 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +[[package]] +name = "prettyplease" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "primitive-types" version = "0.11.1" @@ -8373,7 +8536,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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0841812012b2d4a6145fae9a6af1534873c32aa67fff26bd09f8fa42c83f95a" +dependencies = [ + "bytes 1.1.0", + "prost-derive 0.11.2", ] [[package]] @@ -8389,9 +8562,31 @@ 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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8b442418ea0822409d9e7d047cbf1e7e9e1760b172bf9982cf29d517c93511" +dependencies = [ + "bytes 1.1.0", + "heck 0.4.0", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost 0.11.2", + "prost-types 0.11.2", "regex", + "syn", "tempfile", "which", ] @@ -8409,6 +8604,19 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" version = "0.9.0" @@ -8416,7 +8624,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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +dependencies = [ + "bytes 1.1.0", + "prost 0.11.2", ] [[package]] @@ -9007,6 +9225,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 +9283,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 +9860,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", @@ -10137,13 +10366,26 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ - "der", + "der 0.5.1", "generic-array 0.14.5", - "pkcs8", + "pkcs8 0.8.0", "subtle", "zeroize", ] +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der 0.6.0", + "generic-array 0.14.5", + "pkcs8 0.9.0", + "zeroize", +] + [[package]] name = "secp256k1" version = "0.21.3" @@ -11206,7 +11448,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" dependencies = [ "base64ct", - "der", + "der 0.5.1", +] + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der 0.6.0", ] [[package]] diff --git a/node/opportunity/Cargo.toml b/node/opportunity/Cargo.toml index 54108180..1886b64b 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.38", features = ["websocket"], optional = true } [dev-dependencies] sc-service-test = { version = "2.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19" }