diff --git a/Cargo.lock b/Cargo.lock index 4070af95d7..22bc437ebc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -641,7 +641,7 @@ dependencies = [ "futures 0.3.17", "futures-timer", "network-api", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pprof", "proptest", "rand 0.8.4", @@ -2619,7 +2619,7 @@ checksum = "a16910e685088843d53132b04e0f10a571fdb193224fc589685b3ba1ce4cb03d" dependencies = [ "cfg-if 1.0.0", "libc", - "windows-sys", + "windows-sys 0.28.0", ] [[package]] @@ -4863,9 +4863,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -6095,7 +6095,7 @@ dependencies = [ "hex", "itertools 0.10.3", "network-p2p-types", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.8.4", "schemars 0.8.3", "serde 1.0.133", @@ -6132,7 +6132,7 @@ dependencies = [ "lru", "network-p2p-types", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 0.4.29", "prometheus", "rand 0.8.4", @@ -6745,10 +6745,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.5", + "lock_api 0.4.6", "parking_lot_core 0.8.5", ] +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api 0.4.6", + "parking_lot_core 0.9.0", +] + [[package]] name = "parking_lot_core" version = "0.6.2" @@ -6778,6 +6788,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2f4f894f3865f6c0e02810fc597300f34dc2510f66400da262d8ae10e75767d" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.10", + "smallvec 1.8.0", + "windows-sys 0.29.0", +] + [[package]] name = "parse-zoneinfo" version = "0.3.0" @@ -9020,7 +9043,7 @@ dependencies = [ "futures-core", "lazy_static 1.4.0", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "prometheus", "simple-stopwatch", ] @@ -9102,7 +9125,7 @@ dependencies = [ "bcs-ext", "futures 0.3.17", "hex", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.8.4", "rand_core 0.6.3", "serde 1.0.133", @@ -9169,7 +9192,7 @@ dependencies = [ "lru", "mirai-annotations", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "proptest", "proptest-derive", "rand 0.8.4", @@ -9279,7 +9302,7 @@ dependencies = [ "futures 0.3.17", "futures-timer", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "proptest", "proptest-derive", "starcoin-account-api", @@ -9411,7 +9434,7 @@ dependencies = [ "num_cpus", "num_enum", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.8.4", "rand_core 0.6.3", "schemars 0.8.3", @@ -9698,7 +9721,7 @@ dependencies = [ "log 0.4.14", "log4rs", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "schemars 0.8.3", "serde 1.0.133", "slog", @@ -9731,7 +9754,7 @@ dependencies = [ "futures-timer", "hex", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde 1.0.133", "starcoin-account-api", "starcoin-account-service", @@ -9784,7 +9807,7 @@ dependencies = [ "jsonrpc-core-client 17.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-server-utils 17.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libloading", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.8.4", "rand_core 0.6.3", "rust-argon2", @@ -9928,7 +9951,7 @@ dependencies = [ "network-p2p-types", "network-rpc-core", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "prometheus", "rand 0.8.4", "serde 1.0.133", @@ -10100,7 +10123,7 @@ dependencies = [ "bcs-ext", "futures 0.3.17", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "starcoin-accumulator", "starcoin-chain-api", "starcoin-crypto", @@ -10236,7 +10259,7 @@ dependencies = [ "network-api", "network-p2p-types", "parity-tokio-ipc 0.9.0", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde 1.0.133", "serde_json", "starcoin-abi-types", @@ -10304,7 +10327,7 @@ dependencies = [ "network-api", "network-p2p-types", "network-rpc-core", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde 1.0.133", "serde_json", "starcoin-abi-decoder", @@ -10421,7 +10444,7 @@ dependencies = [ "anyhow", "bcs-ext", "forkable-jellyfish-merkle", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde 1.0.133", "starcoin-crypto", "starcoin-state-store-api", @@ -10436,7 +10459,7 @@ dependencies = [ "bcs-ext", "forkable-jellyfish-merkle", "lru", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde 1.0.133", "starcoin-crypto", "starcoin-logger", @@ -10460,7 +10483,7 @@ dependencies = [ "lru", "num_enum", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "proptest", "proptest-derive", "rand 0.8.4", @@ -10520,7 +10543,7 @@ dependencies = [ "network-api", "network-rpc-core", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "pin-utils", "rand 0.8.4", @@ -10683,7 +10706,7 @@ dependencies = [ "log 0.4.14", "network-api", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "proptest", "proptest-derive", "rand 0.8.4", @@ -10944,7 +10967,7 @@ dependencies = [ "futures-retry", "futures-timer", "log 0.4.14", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 0.4.29", "pin-utils", "schemars 0.8.3", @@ -12808,11 +12831,24 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.28.0", + "windows_i686_gnu 0.28.0", + "windows_i686_msvc 0.28.0", + "windows_x86_64_gnu 0.28.0", + "windows_x86_64_msvc 0.28.0", +] + +[[package]] +name = "windows-sys" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceb069ac8b2117d36924190469735767f0990833935ab430155e71a44bafe148" +dependencies = [ + "windows_aarch64_msvc 0.29.0", + "windows_i686_gnu 0.29.0", + "windows_i686_msvc 0.29.0", + "windows_x86_64_gnu 0.29.0", + "windows_x86_64_msvc 0.29.0", ] [[package]] @@ -12821,30 +12857,60 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2" +[[package]] +name = "windows_aarch64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" + [[package]] name = "windows_i686_gnu" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a" +[[package]] +name = "windows_i686_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58" + [[package]] name = "windows_i686_msvc" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64" +[[package]] +name = "windows_i686_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" + [[package]] name = "windows_x86_64_gnu" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954" +[[package]] +name = "windows_x86_64_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354" + [[package]] name = "windows_x86_64_msvc" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f" +[[package]] +name = "windows_x86_64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" + [[package]] name = "winreg" version = "0.6.2" diff --git a/account/Cargo.toml b/account/Cargo.toml index 54ea95e336..3d2daa3b9c 100644 --- a/account/Cargo.toml +++ b/account/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0.41" futures = "0.3.12" async-trait = "0.1" rand = "0.8.4" -parking_lot = "0.11" +parking_lot = "0.12" serde = "1.0.130" serde_json = "~1" rand_core = { version = "0.6.3", default-features = false } diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index 55c848b739..80d83cd65d 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -23,7 +23,7 @@ starcoin-genesis = {path = "../genesis"} starcoin-executor = {path = "../executor", package="starcoin-executor" } starcoin-vm-types = { path = "../vm/types" } starcoin-account-api = { path = "../account/api"} -parking_lot = "0.11" +parking_lot = "0.12" forkable-jellyfish-merkle = { path = "../commons/forkable-jellyfish-merkle"} starcoin-state-store-api = {path = "../state/state-store-api"} starcoin-state-tree = {path = "../state/state-tree"} diff --git a/chain/mock/Cargo.toml b/chain/mock/Cargo.toml index d15ecd1e0e..7dae8a8148 100644 --- a/chain/mock/Cargo.toml +++ b/chain/mock/Cargo.toml @@ -20,7 +20,7 @@ starcoin-state-api = { path = "../../state/api" } starcoin-accumulator = { path = "../../commons/accumulator", package = "starcoin-accumulator" } async-trait = "0.1" futures = "0.3.12" -parking_lot = "0.11" +parking_lot = "0.12" once_cell = "1.8.0" starcoin-storage = { path = "../../storage" } futures-timer = "3.0" diff --git a/chain/open-block/Cargo.toml b/chain/open-block/Cargo.toml index e4e2f65e17..70df940b9d 100644 --- a/chain/open-block/Cargo.toml +++ b/chain/open-block/Cargo.toml @@ -17,7 +17,7 @@ starcoin-chain-api = {path = "../api"} starcoin-accumulator = {path = "../../commons/accumulator", package="starcoin-accumulator"} async-trait = "0.1" futures = "0.3.12" -parking_lot = "0.11" +parking_lot = "0.12" once_cell = "1.8.0" storage = { package="starcoin-storage", path = "../../storage"} logger = {path = "../../commons/logger", package="starcoin-logger"} diff --git a/cmd/miner_client/Cargo.toml b/cmd/miner_client/Cargo.toml index 9fd099c47b..fcc6f30ad8 100644 --- a/cmd/miner_client/Cargo.toml +++ b/cmd/miner_client/Cargo.toml @@ -36,7 +36,7 @@ starcoin-rpc-api = { path = "../../rpc/api" } starcoin-service-registry = { path = "../../commons/service-registry" } libloading = "0.7.2" dyn-clone = "1.0.4" -parking_lot = "0.11.2" +parking_lot = "0.12.0" starcoin-stratum = { path = "../../stratum" } starcoin-miner = { path = "../../miner" } starcoin-miner-client-api = { path = "./api" } diff --git a/commons/accumulator/Cargo.toml b/commons/accumulator/Cargo.toml index 2f2232121e..bf13ba2661 100644 --- a/commons/accumulator/Cargo.toml +++ b/commons/accumulator/Cargo.toml @@ -18,7 +18,7 @@ starcoin-crypto = { package="starcoin-crypto", path = "../../commons/crypto"} bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" } serde = { version = "1.0.130" } lru = "0.7.0" -parking_lot = "0.11.2" +parking_lot = "0.12.0" schemars = {git = "https://github.com/starcoinorg/schemars", rev="fd4e39f69bf331464a7520676bd67d202a14a6db"} [dev-dependencies] diff --git a/commons/logger/Cargo.toml b/commons/logger/Cargo.toml index c083850b42..923d61d9fa 100644 --- a/commons/logger/Cargo.toml +++ b/commons/logger/Cargo.toml @@ -18,5 +18,5 @@ arc-swap = "1.5.0" log4rs = { version="1.0.0", features = ["background_rotation", "gzip"]} once_cell = "1.8.0" serde = { version = "1.0.130", features = ["derive"] } -parking_lot = "0.11.2" +parking_lot = "0.12.0" schemars = {git = "https://github.com/starcoinorg/schemars", rev="fd4e39f69bf331464a7520676bd67d202a14a6db"} diff --git a/commons/stream-task/Cargo.toml b/commons/stream-task/Cargo.toml index 81c730d87e..141bdccea8 100644 --- a/commons/stream-task/Cargo.toml +++ b/commons/stream-task/Cargo.toml @@ -15,7 +15,7 @@ futures-retry = "0.5.0" pin-project = "0.4.8" log = "0.4.14" serde = { version = "1.0.130", features = ["derive"] } -parking_lot = "0.11.2" +parking_lot = "0.12.0" schemars = {git = "https://github.com/starcoinorg/schemars", rev="fd4e39f69bf331464a7520676bd67d202a14a6db"} [dev-dependencies] diff --git a/commons/utils/Cargo.toml b/commons/utils/Cargo.toml index d1a0d406ae..6b40d03c4e 100644 --- a/commons/utils/Cargo.toml +++ b/commons/utils/Cargo.toml @@ -16,7 +16,7 @@ lazy_static = "1.4.0" prometheus = "0.13.0" simple-stopwatch="0.1.4" once_cell = "1.8.0" -parking_lot = "0.11.2" +parking_lot = "0.12.0" [features] default = ["metered"] diff --git a/config/Cargo.toml b/config/Cargo.toml index 80d8b36500..e989f681ed 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -24,7 +24,7 @@ num_enum = "0.5.6" rand = "0.8.4" rand_core = { version = "0.6.3", default-features = false } num_cpus = "1.13" -parking_lot = "0.11.2" +parking_lot = "0.12.0" starcoin-types = { path = "../types" } starcoin-vm-types = { path = "../vm/types" } starcoin-uint = { path = "../types/uint" } diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 0c267bc824..dac664145c 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -11,7 +11,7 @@ futures-timer = "3.0" hex = { version = "0.4.3" } thiserror = "1.0" once_cell = "1.8.0" -parking_lot = "0.11.2" +parking_lot = "0.12.0" starcoin-config = { path = "../config" } starcoin-chain = { path = "../chain" } diff --git a/network-p2p/Cargo.toml b/network-p2p/Cargo.toml index d806a70c1f..d4a627af96 100644 --- a/network-p2p/Cargo.toml +++ b/network-p2p/Cargo.toml @@ -25,7 +25,7 @@ linked-hash-map = "0.5.4" linked_hash_set = "0.1.3" log = "0.4.14" lru = "0.7.0" -parking_lot = "0.11.2" +parking_lot = "0.12.0" rand = "0.8.4" pin-project = "0.4.27" serde = { version = "1.0.130", features = ["derive"] } diff --git a/network/Cargo.toml b/network/Cargo.toml index 24896cd4d1..e7e3f70754 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -32,7 +32,7 @@ bitflags = "1.3.2" tempfile = "3.1.0" rand = "0.8.4" -parking_lot = "0.11.2" +parking_lot = "0.12.0" lru = "0.7.0" serde = { version = "1.0.130", features = ["derive"] } diff --git a/network/api/Cargo.toml b/network/api/Cargo.toml index fec10f3f60..447178aed3 100644 --- a/network/api/Cargo.toml +++ b/network/api/Cargo.toml @@ -12,7 +12,7 @@ serde = { version = "1.0.130", default-features = false } rand = "0.8.4" itertools = "0.10.3" async-trait = "0.1.51" -parking_lot = "0.11.2" +parking_lot = "0.12.0" starcoin-logger = { path = "../../commons/logger"} starcoin-types = { path = "../../types" } diff --git a/rpc/client/Cargo.toml b/rpc/client/Cargo.toml index f436d5e5c6..d591c81f9b 100644 --- a/rpc/client/Cargo.toml +++ b/rpc/client/Cargo.toml @@ -16,7 +16,7 @@ actix = "0.10.0" actix-rt = "1.1" tokio = "0.2" log = "0.4.14" -parking_lot = "0.11.2" +parking_lot = "0.12.0" jsonrpc-core = { version = "17.0.0", features = ["arbitrary_precision"] } jsonrpc-derive = "17.0.0" jsonrpc-server-utils = "17.1.0" diff --git a/rpc/server/Cargo.toml b/rpc/server/Cargo.toml index d23b2b6d19..30ca6d8e0f 100644 --- a/rpc/server/Cargo.toml +++ b/rpc/server/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] log = "0.4" -parking_lot = "0.11" +parking_lot = "0.12" futures-channel = "0.3" anyhow = "1.0.41" thiserror = "1.0" diff --git a/state/state-tree/Cargo.toml b/state/state-tree/Cargo.toml index 0a2c91002e..f72aae37b8 100644 --- a/state/state-tree/Cargo.toml +++ b/state/state-tree/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] anyhow = "1.0.41" -parking_lot = "0.11.2" +parking_lot = "0.12.0" starcoin-types = {path = "../../types"} starcoin-crypto = { path = "../../commons/crypto"} serde = { version = "1.0.130" } diff --git a/state/statedb/Cargo.toml b/state/statedb/Cargo.toml index 45527a8332..51275b2204 100644 --- a/state/statedb/Cargo.toml +++ b/state/statedb/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] anyhow = "1.0.41" thiserror = "1.0" -parking_lot = "0.11.2" +parking_lot = "0.12.0" lru = "0.7.0" starcoin-types = {path = "../../types"} starcoin-vm-types = {path = "../../vm/types"} diff --git a/storage/Cargo.toml b/storage/Cargo.toml index 057a9a2b4b..aac0e28abe 100644 --- a/storage/Cargo.toml +++ b/storage/Cargo.toml @@ -16,7 +16,7 @@ bcs-ext = { package="bcs-ext", path = "../commons/bcs_ext" } chrono = "0.4" byteorder = "1.4.3" lru = "0.7.0" -parking_lot = "0.11.2" +parking_lot = "0.12.0" proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } once_cell = "1.8.0" diff --git a/sync/Cargo.toml b/sync/Cargo.toml index adf587a3cf..dd19d5620e 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -29,7 +29,7 @@ logger = {path = "../commons/logger",package="starcoin-logger"} consensus = {path = "../consensus", package="starcoin-consensus" } executor = {path = "../executor", package="starcoin-executor" } starcoin-state-tree = { package="starcoin-state-tree", path = "../state/state-tree"} -parking_lot = "0.11" +parking_lot = "0.12" forkable-jellyfish-merkle = { path = "../commons/forkable-jellyfish-merkle"} network-api = {package="network-api", path="../network/api"} starcoin-sync-api = {package="starcoin-sync-api", path="../sync/api"} diff --git a/txpool/Cargo.toml b/txpool/Cargo.toml index 4e81971186..f2cbb552e4 100644 --- a/txpool/Cargo.toml +++ b/txpool/Cargo.toml @@ -17,7 +17,7 @@ rand = "0.8.4" rand_core = { version = "0.6.3", default-features = false } serde = "1.0.130" serde_derive = "1.0" -parking_lot = "0.11" +parking_lot = "0.12" linked-hash-map = "0.5" trace-time = "0.1" starcoin-logger = {path = "../commons/logger"}