diff --git a/Cargo.lock b/Cargo.lock index eb8db94485..ac381c1333 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1032,12 +1032,13 @@ dependencies = [ [[package]] name = "dashmap" -version = "4.0.2" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "c0834a35a3fce649144119e18da2a4d8ed12ef3862f47183fd46f625d072d96c" dependencies = [ "cfg-if 1.0.0", "num_cpus", + "parking_lot 0.12.0", "rayon", ] @@ -1399,7 +1400,7 @@ checksum = "cfc110fe50727d46a428eed832df40affe9bf74d077cac1bf3f2718e823f14c5" dependencies = [ "cfg-if 1.0.0", "libc", - "windows-sys", + "windows-sys 0.28.0", ] [[package]] @@ -2414,9 +2415,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", ] @@ -2712,9 +2713,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -2918,10 +2919,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.1", +] + [[package]] name = "parking_lot_core" version = "0.6.2" @@ -2951,6 +2962,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.10", + "smallvec 1.7.0", + "windows-sys 0.32.0", +] + [[package]] name = "pbkdf2" version = "0.4.0" @@ -5476,7 +5500,7 @@ dependencies = [ "log 0.4.14", "num-derive", "num-traits", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "rustc_version 0.4.0", "rustversion", @@ -7505,11 +7529,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.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +dependencies = [ + "windows_aarch64_msvc 0.32.0", + "windows_i686_gnu 0.32.0", + "windows_i686_msvc 0.32.0", + "windows_x86_64_gnu 0.32.0", + "windows_x86_64_msvc 0.32.0", ] [[package]] @@ -7518,30 +7555,60 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2" +[[package]] +name = "windows_aarch64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + [[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.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + [[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.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + [[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.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + [[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.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + [[package]] name = "winreg" version = "0.7.0" diff --git a/core/Cargo.toml b/core/Cargo.toml index bf39c6e6ea..b13fd3f37a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -20,7 +20,7 @@ bincode = "1.3.3" bs58 = "0.4.0" chrono = { version = "0.4.11", features = ["serde"] } crossbeam-channel = "0.5" -dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] } +dashmap = { version = "5.1.0", features = ["rayon", "raw-api"] } etcd-client = { version = "0.8.1", features = ["tls"]} fs_extra = "1.2.0" histogram = "0.6.9" diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index c8ddf22f2c..7977aa5925 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -47,7 +47,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.9.10" } thiserror = "1.0" [dev-dependencies] -num_cpus = "1.13.0" +num_cpus = "1.13.1" serial_test = "0.5.1" [build-dependencies] diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml index 2369a4050a..2ac50a13e6 100644 --- a/keygen/Cargo.toml +++ b/keygen/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" bs58 = "0.4.0" clap = "2.33" dirs-next = "2.0.0" -num_cpus = "1.13.0" +num_cpus = "1.13.1" solana-clap-utils = { path = "../clap-utils", version = "=1.9.10" } solana-cli-config = { path = "../cli-config", version = "=1.9.10" } solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.10" } diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index 343e6c4d05..0c76f9782a 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -14,7 +14,7 @@ bs58 = "0.4.0" bytecount = "0.6.2" clap = "2.33.1" csv = "1.1.6" -dashmap = "4.0.2" +dashmap = "5.1.0" histogram = "*" itertools = "0.10.1" log = { version = "0.4.14" } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index d1d850f703..96c0af1f0e 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -23,7 +23,7 @@ libc = "0.2.108" log = { version = "0.4.14" } num-derive = "0.3" num-traits = "0.2" -num_cpus = "1.13.0" +num_cpus = "1.13.1" prost = "0.9.0" rand = "0.7.0" rand_chacha = "0.2.2" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index a342f180e8..262b37300c 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -585,12 +585,13 @@ dependencies = [ [[package]] name = "dashmap" -version = "4.0.2" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "c0834a35a3fce649144119e18da2a4d8ed12ef3862f47183fd46f625d072d96c" dependencies = [ "cfg-if 1.0.0", "num_cpus", + "parking_lot 0.12.0", "rayon", ] @@ -1421,9 +1422,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[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", ] @@ -1686,7 +1687,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "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", + "parking_lot_core 0.9.1", ] [[package]] @@ -1703,6 +1714,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + [[package]] name = "pbkdf2" version = "0.4.0" @@ -3114,7 +3138,7 @@ dependencies = [ "log", "num-derive", "num-traits", - "parking_lot", + "parking_lot 0.11.2", "rand 0.7.3", "rustc_version", "rustversion", @@ -3155,7 +3179,7 @@ dependencies = [ "log", "num-derive", "num-traits", - "parking_lot", + "parking_lot 0.12.0", "rand 0.7.3", "rustc_version", "rustversion", @@ -3235,7 +3259,7 @@ dependencies = [ "log", "num-derive", "num-traits", - "parking_lot", + "parking_lot 0.11.2", "qstring", "semver", "solana-sdk", @@ -3754,7 +3778,7 @@ dependencies = [ "mio", "num_cpus", "once_cell", - "parking_lot", + "parking_lot 0.11.2", "pin-project-lite", "signal-hook-registry", "tokio-macros", @@ -4183,6 +4207,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +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.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_i686_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + [[package]] name = "winreg" version = "0.7.0" diff --git a/rayon-threadlimit/Cargo.toml b/rayon-threadlimit/Cargo.toml index 6253f73dd8..bac968ad98 100644 --- a/rayon-threadlimit/Cargo.toml +++ b/rayon-threadlimit/Cargo.toml @@ -11,7 +11,7 @@ license = "Apache-2.0" edition = "2021" [dependencies] -num_cpus = "1.13.0" +num_cpus = "1.13.1" lazy_static = "1.4.0" [package.metadata.docs.rs] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index c24d120e24..c3d5256b98 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,7 +14,7 @@ base64 = "0.12.3" bincode = "1.3.3" bs58 = "0.4.0" crossbeam-channel = "0.5" -dashmap = "4.0.2" +dashmap = "5.1.0" itertools = "0.10.1" jsonrpc-core = "18.0.0" jsonrpc-core-client = { version = "18.0.0", features = ["ipc", "ws"] } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 423160c905..c494e7e729 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -17,7 +17,7 @@ bv = { version = "0.11.1", features = ["serde"] } bytemuck = "1.7.2" byteorder = "1.4.3" bzip2 = "0.4.3" -dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] } +dashmap = { version = "5.1.0", features = ["rayon", "raw-api"] } crossbeam-channel = "0.5" dir-diff = "0.3.2" flate2 = "1.0.22" @@ -27,7 +27,7 @@ itertools = "0.10.1" lazy_static = "1.4.0" log = "0.4.14" memmap2 = "0.5.0" -num_cpus = "1.13.0" +num_cpus = "1.13.1" num-derive = { version = "0.3" } num-traits = { version = "0.2" } ouroboros = "0.13.0" diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index 79fbedc517..8fb218f177 100644 --- a/sdk/program/Cargo.toml +++ b/sdk/program/Cargo.toml @@ -51,7 +51,7 @@ js-sys = "0.3.55" getrandom = { version = "0.1", features = ["wasm-bindgen"] } [target.'cfg(not(target_pointer_width = "64"))'.dependencies] -parking_lot = "0.11" +parking_lot = "0.12" [dev-dependencies] anyhow = "1.0.45" diff --git a/validator/Cargo.toml b/validator/Cargo.toml index 243f64c6a1..4b11463d38 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -23,7 +23,7 @@ jsonrpc-derive = "18.0.0" jsonrpc-ipc-server = "18.0.0" jsonrpc-server-utils= "18.0.0" log = "0.4.14" -num_cpus = "1.13.0" +num_cpus = "1.13.1" rand = "0.7.0" solana-clap-utils = { path = "../clap-utils", version = "=1.9.10" } solana-cli-config = { path = "../cli-config", version = "=1.9.10" }