diff --git a/Cargo.lock b/Cargo.lock index 833cbb4dc0..04a5019ce7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -150,9 +150,9 @@ checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" [[package]] name = "bitflags" -version = "1.0.3" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitstring" @@ -314,6 +314,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "cloudabi" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467" +dependencies = [ + "bitflags", +] + [[package]] name = "cmake" version = "0.1.35" @@ -349,7 +358,7 @@ dependencies = [ "lru-cache", "merkle-trie", "num-rational", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "rand 0.6.1", "rand_xorshift", @@ -404,7 +413,7 @@ dependencies = [ "lazy_static 1.4.0", "log 0.4.8", "never-type", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "rand 0.6.1", "rlp", @@ -431,7 +440,7 @@ dependencies = [ "kvdb", "lazy_static 1.4.0", "log 0.4.8", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "rand 0.6.1", "rlp", "rustc-hex 1.0.0", @@ -451,7 +460,7 @@ dependencies = [ "crossbeam", "log 0.4.8", "mio", - "parking_lot 0.6.4", + "parking_lot 0.11.0", ] [[package]] @@ -474,7 +483,7 @@ dependencies = [ "codechain-crypto", "lazy_static 1.4.0", "never-type", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "rand 0.6.1", "rand_xorshift", @@ -498,7 +507,7 @@ dependencies = [ "libc", "log 0.4.8", "matches", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "rand 0.6.1", "rustc-hex 1.0.0", @@ -519,7 +528,7 @@ dependencies = [ "env_logger 0.6.0", "lazy_static 1.4.0", "log 0.4.8", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "sendgrid", "serde", "serde_derive", @@ -544,7 +553,7 @@ dependencies = [ "log 0.4.8", "mio", "never-type", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "rand 0.6.1", "rlp", @@ -576,7 +585,7 @@ dependencies = [ "kvdb", "lazy_static 1.4.0", "log 0.4.8", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "rand 0.6.1", "rlp", @@ -603,7 +612,7 @@ dependencies = [ "log 0.4.8", "lru-cache", "merkle-trie", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "rand 0.6.1", "rand_xorshift", @@ -642,7 +651,7 @@ version = "0.1.0" dependencies = [ "codechain-logger", "log 0.4.8", - "parking_lot 0.6.4", + "parking_lot 0.11.0", ] [[package]] @@ -1087,7 +1096,7 @@ dependencies = [ "log 0.4.8", "never-type", "panic_hook", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "rpassword", "rustc-serialize", @@ -1399,6 +1408,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" +[[package]] +name = "instant" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485" + [[package]] name = "interleaved-ordered" version = "0.1.1" @@ -1588,9 +1603,9 @@ checksum = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" [[package]] name = "libc" -version = "0.2.68" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" +checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701" [[package]] name = "libflate" @@ -1681,7 +1696,16 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" dependencies = [ - "scopeguard 1.0.0", + "scopeguard 1.1.0", +] + +[[package]] +name = "lock_api" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c" +dependencies = [ + "scopeguard 1.1.0", ] [[package]] @@ -1858,7 +1882,7 @@ dependencies = [ "codechain-key", "coordinator", "lazy_static 1.4.0", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "serde", "serde_cbor", @@ -2107,6 +2131,17 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "parking_lot" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733" +dependencies = [ + "instant", + "lock_api 0.4.1", + "parking_lot_core 0.8.0", +] + [[package]] name = "parking_lot_core" version = "0.3.1" @@ -2127,7 +2162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" dependencies = [ "cfg-if", - "cloudabi", + "cloudabi 0.0.3", "libc", "redox_syscall", "rustc_version", @@ -2135,6 +2170,21 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "parking_lot_core" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" +dependencies = [ + "cfg-if", + "cloudabi 0.1.0", + "instant", + "libc", + "redox_syscall", + "smallvec 1.4.1", + "winapi 0.3.8", +] + [[package]] name = "pbkdf2" version = "0.3.0" @@ -2326,7 +2376,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" dependencies = [ - "cloudabi", + "cloudabi 0.0.3", "fuchsia-zircon", "libc", "rand_core 0.2.2", @@ -2339,7 +2389,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a" dependencies = [ - "cloudabi", + "cloudabi 0.0.3", "fuchsia-zircon", "libc", "rand_chacha 0.1.0", @@ -2457,9 +2507,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.40" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" +checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" [[package]] name = "redox_termios" @@ -2663,9 +2713,9 @@ checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" [[package]] name = "scopeguard" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scrypt" @@ -2885,6 +2935,12 @@ dependencies = [ "unreachable", ] +[[package]] +name = "smallvec" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f" + [[package]] name = "snap" version = "0.2.4" @@ -2945,7 +3001,7 @@ dependencies = [ "codechain-types", "coordinator", "lazy_static 1.4.0", - "parking_lot 0.6.4", + "parking_lot 0.11.0", "primitives", "serde", "serde_cbor", diff --git a/Cargo.toml b/Cargo.toml index 5bacac144c..4850644920 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ log = "0.4.6" env_logger = "0.5.3" never-type = "0.1.0" panic_hook = { path = "util/panic_hook" } -parking_lot = "0.6.0" +parking_lot = "0.11.0" primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" } rpassword = "2.0.0" rustc-serialize = "0.3" diff --git a/basic_module/account/Cargo.toml b/basic_module/account/Cargo.toml index 57e66afcd2..1b9250b155 100644 --- a/basic_module/account/Cargo.toml +++ b/basic_module/account/Cargo.toml @@ -9,7 +9,7 @@ ccrypto = { package = "codechain-crypto", git = "https://github.com/CodeChain-io ckey = {package = "codechain-key", path = "../../key" } coordinator = {package = "coordinator", path = "../../coordinator" } lazy_static = "1.2" -parking_lot = "0.6.0" +parking_lot = "0.11.0" primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" } serde = "1.0" serde_cbor = "0.11.1" diff --git a/basic_module/staking/Cargo.toml b/basic_module/staking/Cargo.toml index 0422d9fee5..dc437bee97 100644 --- a/basic_module/staking/Cargo.toml +++ b/basic_module/staking/Cargo.toml @@ -10,7 +10,7 @@ coordinator = { path = "../../coordinator" } fkey = { path = "../../key", package = "codechain-key" } ftypes = { path = "../../types", package = "codechain-types" } lazy_static = "1.4" -parking_lot = "0.6.0" +parking_lot = "0.11.0" primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" } serde = { version = "1.0", features = ["derive"] } serde_cbor = "0.11.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index 5e7059ec71..453073434e 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -27,7 +27,7 @@ log = "0.4.6" lru-cache = "0.1.2" merkle-trie = { git = "https://github.com/CodeChain-io/rust-merkle-trie.git", version = "0.4" } num-rational = "0.2.1" -parking_lot = "0.6.0" +parking_lot = "0.11.0" primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" } rand = "0.6.1" rlp = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.4" } diff --git a/discovery/Cargo.toml b/discovery/Cargo.toml index fec6fa95bf..0d518dfdec 100644 --- a/discovery/Cargo.toml +++ b/discovery/Cargo.toml @@ -11,7 +11,7 @@ cnetwork = { package = "codechain-network", path = "../network" } ctimer = { package = "codechain-timer", path = "../util/timer" } log = "0.4.6" never-type = "0.1.0" -parking_lot = "0.6.0" +parking_lot = "0.11.0" primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" } rand = "0.6.1" rlp = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.4" } diff --git a/informer/Cargo.toml b/informer/Cargo.toml index 8837760eee..4f54a2cf28 100644 --- a/informer/Cargo.toml +++ b/informer/Cargo.toml @@ -12,7 +12,7 @@ codechain-logger = { path = "../util/logger" } kvdb = "0.1" lazy_static = "1.2" crossbeam-channel = "0.3" -parking_lot = "0.6.0" +parking_lot = "0.11.0" rlp = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.4" } cinfo_courier = { package = "codechain_informer_courier", path = "../informer_courier" } ccore = { package = "codechain-core", path = "../core" } diff --git a/key/Cargo.toml b/key/Cargo.toml index d2958a9cd8..853f1f2ab2 100644 --- a/key/Cargo.toml +++ b/key/Cargo.toml @@ -12,7 +12,7 @@ lazy_static = "1.2" base64 = "0.12" codechain-crypto = { git = "https://github.com/CodeChain-io/rust-codechain-crypto.git", version = "0.2" } never-type = "0.1.0" -parking_lot = "0.6.0" +parking_lot = "0.11.0" primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" } rand_xorshift = "0.1.0" rlp = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.4" } diff --git a/keystore/Cargo.toml b/keystore/Cargo.toml index 6f0aa99834..5bbf9e2f12 100644 --- a/keystore/Cargo.toml +++ b/keystore/Cargo.toml @@ -16,7 +16,7 @@ serde_json = "1.0" serde_derive = "1.0" rustc-hex = "1.0" time = "0.1.34" -parking_lot = "0.6.0" +parking_lot = "0.11.0" ccrypto = { package = "codechain-crypto", git = "https://github.com/CodeChain-io/rust-codechain-crypto.git", version = "0.2" } smallvec = "0.4" tempdir = "0.3" diff --git a/network/Cargo.toml b/network/Cargo.toml index 03839b3a06..2341cf5477 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -18,7 +18,7 @@ log = "0.4.6" kvdb="0.1" mio = "0.6.16" never-type = "0.1.0" -parking_lot = "0.6.0" +parking_lot = "0.11.0" rand = "0.6.1" rlp = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.4" } rlp_derive = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.2" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index c5c0b717ea..de8c98b67c 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -20,7 +20,7 @@ codechain-types = { path = "../types" } kvdb = "0.1" lazy_static = "1.2" log = "0.4.6" -parking_lot = "0.6.0" +parking_lot = "0.11.0" primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" } rlp = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.4" } serde = "1.0" diff --git a/state/Cargo.toml b/state/Cargo.toml index fa2f70c2e7..40d5e48ee7 100644 --- a/state/Cargo.toml +++ b/state/Cargo.toml @@ -16,7 +16,7 @@ kvdb-memorydb = "0.1" log = "0.4.6" lru-cache = "0.1.1" merkle-trie = { git = "https://github.com/CodeChain-io/rust-merkle-trie.git", version = "0.4" } -parking_lot = "0.6.0" +parking_lot = "0.11.0" primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" } rlp = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.4" } rlp_derive = { git = "https://github.com/CodeChain-io/rlp.git", version = "0.2" } diff --git a/util/io/Cargo.toml b/util/io/Cargo.toml index f0849917d0..32a3140c45 100644 --- a/util/io/Cargo.toml +++ b/util/io/Cargo.toml @@ -11,5 +11,5 @@ edition = "2018" codechain-logger = { path = "../logger" } mio = "0.6.16" crossbeam = "0.5.0" -parking_lot = "0.6.0" +parking_lot = "0.11.0" log = "0.4.6" diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml index 5808f502fe..489bdc6dcc 100644 --- a/util/logger/Cargo.toml +++ b/util/logger/Cargo.toml @@ -10,7 +10,7 @@ colored = "1.6" env_logger = "0.6.0" lazy_static = "1.2" log = "0.4.6" -parking_lot = "0.6.0" +parking_lot = "0.11.0" sendgrid = "0.8.1" serde = "1.0" serde_derive = "1.0" diff --git a/util/timer/Cargo.toml b/util/timer/Cargo.toml index 322427a4ce..f7e977363d 100644 --- a/util/timer/Cargo.toml +++ b/util/timer/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [lib] [dependencies] -parking_lot = "0.6.0" +parking_lot = "0.11.0" log = "0.4.6" codechain-logger = { path = "../logger" }