diff --git a/Cargo.lock b/Cargo.lock index 340e2884..7e518914 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -338,7 +338,7 @@ checksum = "0bef3111e70cb8ed40a2250252cfa96d64b880fbb58b0f67a049b6945503f8d6" dependencies = [ "async-io", "lapin", - "parking_lot", + "parking_lot 0.11.2", ] [[package]] @@ -542,9 +542,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" @@ -601,7 +601,7 @@ dependencies = [ "futures 0.3.19", "log", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "sc-chain-spec", "sc-client-api", "sc-keystore", @@ -635,7 +635,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "sc-rpc", "sc-utils", "serde", @@ -2041,7 +2041,7 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "scale-info", ] @@ -2409,7 +2409,7 @@ checksum = "62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e" dependencies = [ "futures-core", "lock_api", - "parking_lot", + "parking_lot 0.11.2", ] [[package]] @@ -3159,7 +3159,7 @@ dependencies = [ "jsonrpc-server-utils", "log", "net2", - "parking_lot", + "parking_lot 0.11.2", "unicase", ] @@ -3174,7 +3174,7 @@ dependencies = [ "jsonrpc-server-utils", "log", "parity-tokio-ipc", - "parking_lot", + "parking_lot 0.11.2", "tower-service", ] @@ -3188,7 +3188,7 @@ dependencies = [ "jsonrpc-core", "lazy_static", "log", - "parking_lot", + "parking_lot 0.11.2", "rand 0.7.3", "serde", ] @@ -3222,7 +3222,7 @@ dependencies = [ "jsonrpc-server-utils", "log", "parity-ws", - "parking_lot", + "parking_lot 0.11.2", "slab", ] @@ -3364,7 +3364,7 @@ checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot", + "parking_lot 0.11.2", ] [[package]] @@ -3379,7 +3379,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot", + "parking_lot 0.11.2", "regex", "rocksdb", "smallvec", @@ -3397,7 +3397,7 @@ dependencies = [ "futures-core", "log", "mio 0.7.14", - "parking_lot", + "parking_lot 0.11.2", "pinky-swear", "serde", ] @@ -3481,7 +3481,7 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot", + "parking_lot 0.11.2", "pin-project 1.0.10", "smallvec", "wasm-timer", @@ -3506,7 +3506,7 @@ dependencies = [ "multiaddr", "multihash 0.14.0", "multistream-select", - "parking_lot", + "parking_lot 0.11.2", "pin-project 1.0.10", "prost", "prost-build", @@ -3680,7 +3680,7 @@ dependencies = [ "libp2p-core", "log", "nohash-hasher", - "parking_lot", + "parking_lot 0.11.2", "rand 0.7.3", "smallvec", "unsigned-varint 0.7.1", @@ -3913,7 +3913,7 @@ checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" dependencies = [ "futures 0.3.19", "libp2p-core", - "parking_lot", + "parking_lot 0.11.2", "thiserror", "yamux", ] @@ -4022,10 +4022,11 @@ checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] @@ -5575,7 +5576,7 @@ dependencies = [ "log", "lz4", "memmap2 0.2.3", - "parking_lot", + "parking_lot 0.11.2", "rand 0.8.4", "snap", ] @@ -5638,7 +5639,7 @@ dependencies = [ "impl-trait-for-tuples", "lru 0.6.6", "parity-util-mem-derive", - "parking_lot", + "parking_lot 0.11.2", "primitive-types", "smallvec", "winapi 0.3.9", @@ -5702,7 +5703,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.3", ] [[package]] @@ -5719,6 +5730,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + [[package]] name = "paste" version = "1.0.6" @@ -5900,7 +5924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bf8cda6f8e1500338634e4e3ce90ac59eb7929a1e088b6946c742be1cc44dc1" dependencies = [ "doc-comment", - "parking_lot", + "parking_lot 0.11.2", "tracing", ] @@ -6125,7 +6149,7 @@ dependencies = [ "async-trait", "futures 0.3.19", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -6411,7 +6435,7 @@ dependencies = [ "log", "mick-jaeger", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -6544,7 +6568,7 @@ dependencies = [ "futures-timer", "lru 0.7.2", "parity-util-mem", - "parking_lot", + "parking_lot 0.11.2", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7122,7 +7146,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot", + "parking_lot 0.11.2", "thiserror", ] @@ -7844,7 +7868,7 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -7875,7 +7899,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -7897,7 +7921,7 @@ dependencies = [ "futures-timer", "libp2p", "log", - "parking_lot", + "parking_lot 0.11.2", "sc-client-api", "sc-utils", "serde", @@ -7926,7 +7950,7 @@ dependencies = [ "num-rational 0.2.4", "num-traits", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -8037,7 +8061,7 @@ dependencies = [ "log", "lru 0.6.6", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -8121,7 +8145,7 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "rand 0.8.4", "sc-block-builder", "sc-chain-spec", @@ -8194,7 +8218,7 @@ dependencies = [ "async-trait", "derive_more", "hex", - "parking_lot", + "parking_lot 0.11.2", "serde_json", "sp-application-crypto", "sp-core", @@ -8226,7 +8250,7 @@ dependencies = [ "log", "lru 0.7.2", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "pin-project 1.0.10", "prost", "prost-build", @@ -8283,7 +8307,7 @@ dependencies = [ "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "rand 0.7.3", "sc-client-api", "sc-network", @@ -8329,7 +8353,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -8361,7 +8385,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "sc-chain-spec", "sc-transaction-pool-api", "serde", @@ -8407,7 +8431,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot", + "parking_lot 0.11.2", "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", @@ -8464,7 +8488,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot", + "parking_lot 0.11.2", "sc-client-api", "sp-core", ] @@ -8500,7 +8524,7 @@ dependencies = [ "futures 0.3.19", "libp2p", "log", - "parking_lot", + "parking_lot 0.11.2", "pin-project 1.0.10", "rand 0.7.3", "serde", @@ -8521,7 +8545,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot", + "parking_lot 0.11.2", "regex", "rustc-hash", "sc-client-api", @@ -8562,7 +8586,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot", + "parking_lot 0.11.2", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -8600,7 +8624,7 @@ dependencies = [ "futures 0.3.19", "futures-timer", "lazy_static", - "parking_lot", + "parking_lot 0.11.2", "prometheus", ] @@ -9147,7 +9171,7 @@ dependencies = [ "log", "lru 0.7.2", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "sp-api", "sp-consensus", "sp-database", @@ -9263,7 +9287,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "parity-util-mem", - "parking_lot", + "parking_lot 0.11.2", "primitive-types", "rand 0.7.3", "regex", @@ -9318,7 +9342,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#28819000207c9bcdf37e31d7d167cd1d420faa7e" dependencies = [ "kvdb", - "parking_lot", + "parking_lot 0.11.2", ] [[package]] @@ -9384,7 +9408,7 @@ dependencies = [ "libsecp256k1", "log", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "sp-core", "sp-externalities", "sp-keystore", @@ -9419,7 +9443,7 @@ dependencies = [ "futures 0.3.19", "merlin", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "schnorrkel", "serde", "sp-core", @@ -9584,7 +9608,7 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot", + "parking_lot 0.11.2", "rand 0.7.3", "smallvec", "sp-core", @@ -9824,7 +9848,7 @@ dependencies = [ "md-5", "memchr", "once_cell", - "parking_lot", + "parking_lot 0.11.2", "percent-encoding 2.1.0", "rand 0.8.4", "rustls", @@ -9909,7 +9933,7 @@ checksum = "11b73400442027c4adedda20a9f9b7945234a5bd8d5f7e86da22bd5d0622369c" dependencies = [ "cfg_aliases", "libc", - "parking_lot", + "parking_lot 0.11.2", "static_init_macro", ] @@ -10053,7 +10077,7 @@ dependencies = [ "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot", + "parking_lot 0.12.1", "polkadot-service", "pretty_env_logger", "sa-work-queue", @@ -10097,7 +10121,7 @@ dependencies = [ "num_cpus", "parity-scale-codec", "parity-util-mem", - "parking_lot", + "parking_lot 0.12.1", "sc-client-api", "sc-executor", "sc-service", @@ -10544,7 +10568,7 @@ dependencies = [ "chrono", "lazy_static", "matchers", - "parking_lot", + "parking_lot 0.11.2", "regex", "serde", "serde_json", @@ -10615,7 +10639,7 @@ dependencies = [ "lazy_static", "log", "lru-cache", - "parking_lot", + "parking_lot 0.11.2", "resolv-conf", "smallvec", "thiserror", @@ -10953,7 +10977,7 @@ checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ "futures 0.3.19", "js-sys", - "parking_lot", + "parking_lot 0.11.2", "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", @@ -11352,6 +11376,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "winreg" version = "0.6.2" @@ -11482,7 +11549,7 @@ dependencies = [ "futures 0.3.19", "log", "nohash-hasher", - "parking_lot", + "parking_lot 0.11.2", "rand 0.8.4", "static_assertions", ] diff --git a/substrate-archive-backend/Cargo.toml b/substrate-archive-backend/Cargo.toml index ae116154..67b65048 100644 --- a/substrate-archive-backend/Cargo.toml +++ b/substrate-archive-backend/Cargo.toml @@ -12,7 +12,7 @@ futures = "0.3" hashbrown = { version = "0.11", features = ["inline-more"] } log = "0.4" num_cpus = "1.13" -parking_lot = "0.11" +parking_lot = "0.12" serde = { version = "1.0", features = ["derive"] } thiserror = "1.0" diff --git a/substrate-archive/Cargo.toml b/substrate-archive/Cargo.toml index c1809e14..a5e0a884 100644 --- a/substrate-archive/Cargo.toml +++ b/substrate-archive/Cargo.toml @@ -21,7 +21,7 @@ itertools = "0.10" itoa = "0.4.7" log = { version = "0.4", features = ["serde"] } num_cpus = "1.13" -parking_lot = "0.11" +parking_lot = "0.12" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["arbitrary_precision"] } async-std = "1.9"