diff --git a/Cargo.lock b/Cargo.lock index d26718fe045a6..668d2bfe07d47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1387,14 +1387,14 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.16" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.3.3", + "rustc_version 0.4.0", "syn", ] @@ -7106,11 +7106,11 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 0.11.0", + "semver 1.0.9", ] [[package]] @@ -8696,6 +8696,12 @@ dependencies = [ "serde", ] +[[package]] +name = "semver" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" + [[package]] name = "semver-parser" version = "0.7.0" diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml index ac643a1109c5a..54349aa32e60e 100644 --- a/bin/node/bench/Cargo.toml +++ b/bin/node/bench/Cargo.toml @@ -20,7 +20,7 @@ sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-m serde = "1.0.126" serde_json = "1.0.41" structopt = "0.3" -derive_more = "0.99.2" +derive_more = "0.99.17" kvdb = "0.10.0" kvdb-rocksdb = "0.12.0" sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" } diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml index 29d38147b988a..e6c1e67967832 100644 --- a/client/api/Cargo.toml +++ b/client/api/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" } -derive_more = "0.99.2" +derive_more = "0.99.17" sc-executor = { version = "0.10.0-dev", path = "../executor" } sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" } fnv = "1.0.6" diff --git a/client/authority-discovery/Cargo.toml b/client/authority-discovery/Cargo.toml index bca84d18d0885..2f59095df55dd 100644 --- a/client/authority-discovery/Cargo.toml +++ b/client/authority-discovery/Cargo.toml @@ -19,7 +19,7 @@ prost-build = "0.7" [dependencies] async-trait = "0.1" codec = { package = "parity-scale-codec", default-features = false, version = "2.0.0" } -derive_more = "0.99.2" +derive_more = "0.99.17" either = "1.5.3" futures = "0.3.9" futures-timer = "3.0.1" diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index c23ad55505766..e121c74f3d323 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -22,7 +22,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" } sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" } sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" } sp-consensus-slots = { version = "0.10.0-dev", path = "../../../primitives/consensus/slots" } -derive_more = "0.99.2" +derive_more = "0.99.17" futures = "0.3.9" futures-timer = "3.0.1" sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" } diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index e6538cb57aae6..57c3afeb0a02f 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -51,7 +51,7 @@ schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] } rand = "0.7.2" merlin = "2.0" pdqselect = "0.1.0" -derive_more = "0.99.2" +derive_more = "0.99.17" retain_mut = "0.1.3" async-trait = "0.1.50" diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml index 5081edf25594f..8fa7c228d6b97 100644 --- a/client/consensus/babe/rpc/Cargo.toml +++ b/client/consensus/babe/rpc/Cargo.toml @@ -24,7 +24,7 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../../../primitives/blockcha sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" } sc-consensus-epochs = { version = "0.10.0-dev", path = "../../epochs" } futures = { version = "0.3.4", features = ["compat"] } -derive_more = "0.99.2" +derive_more = "0.99.17" sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" } sp-consensus = { version = "0.10.0-dev", path = "../../../../primitives/consensus/common" } sp-core = { version = "4.0.0-dev", path = "../../../../primitives/core" } diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml index a0de596b005b7..919e9cd9fe73d 100644 --- a/client/consensus/manual-seal/Cargo.toml +++ b/client/consensus/manual-seal/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -derive_more = "0.99.2" +derive_more = "0.99.17" futures = "0.3.9" jsonrpc-core = "15.1.0" jsonrpc-core-client = "15.1.0" diff --git a/client/consensus/poc/Cargo.toml b/client/consensus/poc/Cargo.toml index 7aa7ca1ae3f09..875ae1f17a2c4 100644 --- a/client/consensus/poc/Cargo.toml +++ b/client/consensus/poc/Cargo.toml @@ -48,7 +48,7 @@ log = "0.4.14" schnorrkel = { version = "0.9.1" } rand = "0.7.2" merlin = "2.0" -derive_more = "0.99.16" +derive_more = "0.99.17" async-trait = "0.1.51" ring = "0.16" diff --git a/client/consensus/pow/Cargo.toml b/client/consensus/pow/Cargo.toml index 368005fafb136..2e06c215747d1 100644 --- a/client/consensus/pow/Cargo.toml +++ b/client/consensus/pow/Cargo.toml @@ -28,6 +28,6 @@ log = "0.4.8" futures = { version = "0.3.1", features = ["compat"] } futures-timer = "3.0.1" parking_lot = "0.11.1" -derive_more = "0.99.2" +derive_more = "0.99.17" prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.9.0"} async-trait = "0.1.50" diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml index a96163f200df8..3363b2fd7c50b 100644 --- a/client/executor/Cargo.toml +++ b/client/executor/Cargo.toml @@ -14,7 +14,7 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -derive_more = "0.99.2" +derive_more = "0.99.17" codec = { package = "parity-scale-codec", version = "2.0.0" } sp-io = { version = "4.0.0-dev", path = "../../primitives/io" } sp-core = { version = "4.0.0-dev", path = "../../primitives/core" } diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml index 4457780f8cd83..1bb826944d0ec 100644 --- a/client/executor/common/Cargo.toml +++ b/client/executor/common/Cargo.toml @@ -14,7 +14,7 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -derive_more = "0.99.2" +derive_more = "0.99.17" pwasm-utils = "0.18.0" codec = { package = "parity-scale-codec", version = "2.0.0" } wasmi = "0.9.0" diff --git a/client/finality-grandpa-warp-sync/Cargo.toml b/client/finality-grandpa-warp-sync/Cargo.toml index 62fe596083336..563dd0e9e729a 100644 --- a/client/finality-grandpa-warp-sync/Cargo.toml +++ b/client/finality-grandpa-warp-sync/Cargo.toml @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0" } -derive_more = "0.99.11" +derive_more = "0.99.17" futures = "0.3.8" log = "0.4.11" num-traits = "0.2.14" diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml index 706538e807243..6fe1b3cbf98df 100644 --- a/client/finality-grandpa/Cargo.toml +++ b/client/finality-grandpa/Cargo.toml @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] -derive_more = "0.99.2" +derive_more = "0.99.17" dyn-clone = "1.0" fork-tree = { version = "3.0.0", path = "../../utils/fork-tree" } futures = "0.3.9" diff --git a/client/keystore/Cargo.toml b/client/keystore/Cargo.toml index a9b53f348ab74..c6278d06f2000 100644 --- a/client/keystore/Cargo.toml +++ b/client/keystore/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] async-trait = "0.1.50" -derive_more = "0.99.2" +derive_more = "0.99.17" futures = "0.3.9" futures-util = "0.3.4" sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" } diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index 9c6b580fb9c66..82a415a6eff0d 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -24,7 +24,7 @@ bs58 = "0.4.0" cid = "0.6.0" bytes = "1" codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] } -derive_more = "0.99.2" +derive_more = "0.99.17" either = "1.5.3" erased-serde = "0.3.9" fnv = "1.0.6" diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml index 0ed17813ee755..1c994a5f7eb1b 100644 --- a/client/rpc-api/Cargo.toml +++ b/client/rpc-api/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0" } -derive_more = "0.99.2" +derive_more = "0.99.17" futures = { version = "0.3.1", features = ["compat"] } jsonrpc-core = "15.1.0" jsonrpc-core-client = "15.1.0" diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml index 846bc68931bd0..db1cd3187a612 100644 --- a/client/transaction-pool/Cargo.toml +++ b/client/transaction-pool/Cargo.toml @@ -31,7 +31,7 @@ sc-transaction-pool-api = { version = "4.0.0-dev", path = "./api" } sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" } sp-utils = { version = "4.0.0-dev", path = "../../primitives/utils" } wasm-timer = "0.2" -derive_more = "0.99.2" +derive_more = "0.99.17" serde = { version = "1.0.126", features = ["derive"] } linked-hash-map = "0.5.2" retain_mut = "0.1.3" diff --git a/client/transaction-pool/api/Cargo.toml b/client/transaction-pool/api/Cargo.toml index b49d47e53fe3b..ac55f234379b3 100644 --- a/client/transaction-pool/api/Cargo.toml +++ b/client/transaction-pool/api/Cargo.toml @@ -16,5 +16,5 @@ thiserror = { version = "1.0.21" } sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" } codec = { package = "parity-scale-codec", version = "2.0.0" } -derive_more = { version = "0.99.11" } +derive_more = { version = "0.99.17" } sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" } diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml index 35c66ef93f7aa..731a19f87c5d3 100644 --- a/primitives/keystore/Cargo.toml +++ b/primitives/keystore/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] async-trait = "0.1.50" -derive_more = "0.99.2" +derive_more = "0.99.17" codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } futures = { version = "0.3.1" } schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false } diff --git a/test-utils/runtime/transaction-pool/Cargo.toml b/test-utils/runtime/transaction-pool/Cargo.toml index 420d052829aab..eef8df1547f45 100644 --- a/test-utils/runtime/transaction-pool/Cargo.toml +++ b/test-utils/runtime/transaction-pool/Cargo.toml @@ -20,4 +20,4 @@ sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" } sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool", features = ["test-helpers"] } sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" } futures = { version = "0.3.1", features = ["compat"] } -derive_more = "0.99.2" +derive_more = "0.99.17"