From f846d9255c3355e090e63f4279aa2a7d83f7a6fb Mon Sep 17 00:00:00 2001 From: Wigy Date: Mon, 21 Feb 2022 18:11:31 +0100 Subject: [PATCH 1/8] Updating dependencies --- Cargo.toml | 2 +- bridges/bin/runtime-common/Cargo.toml | 4 ++-- bridges/modules/dispatch/Cargo.toml | 4 ++-- bridges/modules/grandpa/Cargo.toml | 6 +++--- bridges/modules/messages/Cargo.toml | 4 ++-- bridges/primitives/chain-rococo/Cargo.toml | 2 +- bridges/primitives/chain-wococo/Cargo.toml | 2 +- bridges/primitives/header-chain/Cargo.toml | 6 +++--- bridges/primitives/message-dispatch/Cargo.toml | 4 ++-- bridges/primitives/messages/Cargo.toml | 4 ++-- bridges/primitives/polkadot-core/Cargo.toml | 4 ++-- bridges/primitives/runtime/Cargo.toml | 4 ++-- bridges/primitives/test-utils/Cargo.toml | 4 ++-- core-primitives/Cargo.toml | 6 +++--- erasure-coding/Cargo.toml | 2 +- node/collation-generation/Cargo.toml | 2 +- node/core/approval-voting/Cargo.toml | 6 +++--- node/core/av-store/Cargo.toml | 6 +++--- node/core/candidate-validation/Cargo.toml | 2 +- node/core/chain-api/Cargo.toml | 2 +- node/core/chain-selection/Cargo.toml | 8 ++++---- node/core/dispute-coordinator/Cargo.toml | 6 +++--- node/core/pvf/Cargo.toml | 2 +- node/core/runtime-api/Cargo.toml | 2 +- node/jaeger/Cargo.toml | 2 +- node/malus/Cargo.toml | 2 +- node/metrics/Cargo.toml | 2 +- node/network/availability-distribution/Cargo.toml | 2 +- node/network/availability-recovery/Cargo.toml | 2 +- node/network/bridge/Cargo.toml | 2 +- node/network/collator-protocol/Cargo.toml | 2 +- node/network/dispute-distribution/Cargo.toml | 2 +- node/network/protocol/Cargo.toml | 2 +- node/network/statement-distribution/Cargo.toml | 2 +- node/overseer/Cargo.toml | 2 +- node/primitives/Cargo.toml | 2 +- node/service/Cargo.toml | 4 ++-- node/subsystem-util/Cargo.toml | 2 +- node/test/client/Cargo.toml | 2 +- node/zombienet-backchannel/Cargo.toml | 2 +- parachain/Cargo.toml | 6 +++--- parachain/test-parachains/Cargo.toml | 2 +- parachain/test-parachains/adder/Cargo.toml | 2 +- parachain/test-parachains/adder/collator/Cargo.toml | 2 +- primitives/Cargo.toml | 6 +++--- runtime/common/Cargo.toml | 4 ++-- runtime/common/slot_range_helper/Cargo.toml | 2 +- runtime/kusama/Cargo.toml | 4 ++-- runtime/metrics/Cargo.toml | 2 +- runtime/parachains/Cargo.toml | 4 ++-- runtime/polkadot/Cargo.toml | 4 ++-- runtime/rococo/Cargo.toml | 4 ++-- runtime/test-runtime/Cargo.toml | 4 ++-- runtime/westend/Cargo.toml | 4 ++-- statement-table/Cargo.toml | 2 +- utils/staking-miner/Cargo.toml | 2 +- xcm/Cargo.toml | 4 ++-- xcm/pallet-xcm-benchmarks/Cargo.toml | 4 ++-- xcm/pallet-xcm/Cargo.toml | 4 ++-- xcm/xcm-builder/Cargo.toml | 4 ++-- xcm/xcm-executor/Cargo.toml | 2 +- xcm/xcm-simulator/Cargo.toml | 2 +- xcm/xcm-simulator/example/Cargo.toml | 4 ++-- xcm/xcm-simulator/fuzzer/Cargo.toml | 4 ++-- 64 files changed, 105 insertions(+), 105 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 885dc830204b..11cd96d5167a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ readme = "README.md" [dependencies] polkadot-cli = { path = "cli", features = [ "kusama-native", "westend-native", "rococo-native" ] } color-eyre = { version = "0.6.0", default-features = false } -parity-util-mem = { version = "*", default-features = false, features = ["jemalloc-global"] } +parity-util-mem = { version = "0.11.0", default-features = false, features = ["jemalloc-global"] } [dev-dependencies] assert_cmd = "2.0.4" diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml index 4e693f05451c..c7885f617482 100644 --- a/bridges/bin/runtime-common/Cargo.toml +++ b/bridges/bin/runtime-common/Cargo.toml @@ -8,10 +8,10 @@ repository = "https://github.com/paritytech/parity-bridges-common/" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } ed25519-dalek = { version = "1.0", default-features = false, optional = true } hash-db = { version = "0.15.2", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } # Bridge dependencies diff --git a/bridges/modules/dispatch/Cargo.toml b/bridges/modules/dispatch/Cargo.toml index 1d91d0a05094..f6d9ff457f5a 100644 --- a/bridges/modules/dispatch/Cargo.toml +++ b/bridges/modules/dispatch/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } log = { version = "0.4.14", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } # Bridge dependencies diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml index 01195abe89e1..5f4057ceb099 100644 --- a/bridges/modules/grandpa/Cargo.toml +++ b/bridges/modules/grandpa/Cargo.toml @@ -8,11 +8,11 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false } -finality-grandpa = { version = "0.14.0", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +finality-grandpa = { version = "0.15.0", default-features = false } log = { version = "0.4.14", default-features = false } num-traits = { version = "0.2", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0", optional = true } # Bridge Dependencies diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml index b48bdc5c0ffd..9aa83399c6f2 100644 --- a/bridges/modules/messages/Cargo.toml +++ b/bridges/modules/messages/Cargo.toml @@ -8,10 +8,10 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] bitvec = { version = "0.20", default-features = false, features = ["alloc"] } -codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } log = { version = "0.4.14", default-features = false } num-traits = { version = "0.2", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } # Bridge dependencies diff --git a/bridges/primitives/chain-rococo/Cargo.toml b/bridges/primitives/chain-rococo/Cargo.toml index 6e1189b05f36..3fc52783045b 100644 --- a/bridges/primitives/chain-rococo/Cargo.toml +++ b/bridges/primitives/chain-rococo/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -parity-scale-codec = { version = "2.2.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } smallvec = "1.7" # Bridge Dependencies diff --git a/bridges/primitives/chain-wococo/Cargo.toml b/bridges/primitives/chain-wococo/Cargo.toml index d99783695ad3..d781de91dfcb 100644 --- a/bridges/primitives/chain-wococo/Cargo.toml +++ b/bridges/primitives/chain-wococo/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -parity-scale-codec = { version = "2.2.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } # Bridge Dependencies bp-messages = { path = "../messages", default-features = false } diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml index 76b710247f74..447f67c8df28 100644 --- a/bridges/primitives/header-chain/Cargo.toml +++ b/bridges/primitives/header-chain/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false } -finality-grandpa = { version = "0.14.0", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +finality-grandpa = { version = "0.15.0", default-features = false } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0", optional = true } # Substrate Dependencies diff --git a/bridges/primitives/message-dispatch/Cargo.toml b/bridges/primitives/message-dispatch/Cargo.toml index 9897b3199781..ed2e90accd57 100644 --- a/bridges/primitives/message-dispatch/Cargo.toml +++ b/bridges/primitives/message-dispatch/Cargo.toml @@ -8,8 +8,8 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] bp-runtime = { path = "../runtime", default-features = false } -codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } # Substrate Dependencies diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml index 31ec46222cd8..9b84a4a5831a 100644 --- a/bridges/primitives/messages/Cargo.toml +++ b/bridges/primitives/messages/Cargo.toml @@ -8,9 +8,9 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] bitvec = { version = "0.20", default-features = false, features = ["alloc"] } -codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "bit-vec"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "bit-vec"] } impl-trait-for-tuples = "0.2" -scale-info = { version = "1.0", default-features = false, features = ["bit-vec", "derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] } serde = { version = "1.0", optional = true, features = ["derive"] } # Bridge dependencies diff --git a/bridges/primitives/polkadot-core/Cargo.toml b/bridges/primitives/polkadot-core/Cargo.toml index f05edd0d91ba..31d2d20b9b9d 100644 --- a/bridges/primitives/polkadot-core/Cargo.toml +++ b/bridges/primitives/polkadot-core/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -parity-scale-codec = { version = "2.2.0", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } # Bridge Dependencies diff --git a/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml index 7cc165fb4e9c..aa80dab056de 100644 --- a/bridges/primitives/runtime/Cargo.toml +++ b/bridges/primitives/runtime/Cargo.toml @@ -7,10 +7,10 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } hash-db = { version = "0.15.2", default-features = false } num-traits = { version = "0.2", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } # Substrate Dependencies diff --git a/bridges/primitives/test-utils/Cargo.toml b/bridges/primitives/test-utils/Cargo.toml index 95121c60993a..97d260c7a7a5 100644 --- a/bridges/primitives/test-utils/Cargo.toml +++ b/bridges/primitives/test-utils/Cargo.toml @@ -7,9 +7,9 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] bp-header-chain = { path = "../header-chain", default-features = false } -codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } ed25519-dalek = { version = "1.0", default-features = false, features = ["u64_backend"] } -finality-grandpa = { version = "0.14.4", default-features = false } +finality-grandpa = { version = "0.15.0", default-features = false } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index bb7c809c65fd..5fadd8f0748d 100644 --- a/core-primitives/Cargo.toml +++ b/core-primitives/Cargo.toml @@ -8,9 +8,9 @@ edition = "2018" sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = [ "derive" ] } -parity-util-mem = { version = "0.10.0", default-features = false, optional = true } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = [ "derive" ] } +parity-util-mem = { version = "0.11.0", default-features = false, optional = true } [features] default = [ "std" ] diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index cd5853df5033..9702395b5f59 100644 --- a/erasure-coding/Cargo.toml +++ b/erasure-coding/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" polkadot-primitives = { path = "../primitives" } polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../node/primitives" } novelpoly = { package = "reed-solomon-novelpoly", version = "1.0.0" } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["std", "derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["std", "derive"] } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" } thiserror = "1.0.30" diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml index 09cc647e441c..8a742affc3ea 100644 --- a/node/collation-generation/Cargo.toml +++ b/node/collation-generation/Cargo.toml @@ -15,7 +15,7 @@ polkadot-primitives = { path = "../../primitives" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "master" } thiserror = "1.0.30" -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["bit-vec", "derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["bit-vec", "derive"] } [dev-dependencies] polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" } diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml index a328dec18d50..71d121d901e8 100644 --- a/node/core/approval-voting/Cargo.toml +++ b/node/core/approval-voting/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" [dependencies] futures = "0.3.21" futures-timer = "3.0.2" -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["bit-vec", "derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["bit-vec", "derive"] } tracing = "0.1.31" bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } lru = "0.7" merlin = "2.0" schnorrkel = "0.9.1" -kvdb = "0.10.0" +kvdb = "0.11.0" derive_more = "0.99.17" polkadot-node-subsystem = { path = "../../subsystem" } @@ -38,5 +38,5 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } assert_matches = "1.4.0" -kvdb-memorydb = "0.10.0" +kvdb-memorydb = "0.11.0" test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" } diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml index 4c79fc9fcff5..8e5a48f3066a 100644 --- a/node/core/av-store/Cargo.toml +++ b/node/core/av-store/Cargo.toml @@ -7,12 +7,12 @@ edition = "2018" [dependencies] futures = "0.3.21" futures-timer = "3.0.2" -kvdb = "0.10.0" +kvdb = "0.11.0" thiserror = "1.0.30" tracing = "0.1.31" bitvec = "0.20.1" -parity-scale-codec = { version = "2.3.1", features = ["derive"] } +parity-scale-codec = { version = "3.0.0", features = ["derive"] } erasure = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } @@ -24,7 +24,7 @@ polkadot-node-primitives = { path = "../../primitives" } log = "0.4.13" env_logger = "0.9.0" assert_matches = "1.4.0" -kvdb-memorydb = "0.10.0" +kvdb-memorydb = "0.11.0" sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml index ab0fbccf1268..00a3f84e750d 100644 --- a/node/core/candidate-validation/Cargo.toml +++ b/node/core/candidate-validation/Cargo.toml @@ -10,7 +10,7 @@ futures = "0.3.21" tracing = "0.1.31" sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "master" } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["bit-vec", "derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["bit-vec", "derive"] } polkadot-primitives = { path = "../../../primitives" } polkadot-parachain = { path = "../../../parachain" } diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml index ecac94abcb46..47d4cd9dbe33 100644 --- a/node/core/chain-api/Cargo.toml +++ b/node/core/chain-api/Cargo.toml @@ -17,7 +17,7 @@ sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = [dev-dependencies] futures = { version = "0.3.21", features = ["thread-pool"] } maplit = "1.0.2" -parity-scale-codec = "2.3.1" +parity-scale-codec = "3.0.0" polkadot-node-primitives = { path = "../../primitives" } polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml index 38544cf0574c..a7261f36db37 100644 --- a/node/core/chain-selection/Cargo.toml +++ b/node/core/chain-selection/Cargo.toml @@ -13,13 +13,13 @@ polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } -kvdb = "0.10.0" +kvdb = "0.11.0" thiserror = "1.0.30" -parity-scale-codec = "2" +parity-scale-codec = "3.0.0" [dev-dependencies] polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -parking_lot = "0.12" +parking_lot = "0.12.0" assert_matches = "1" -kvdb-memorydb = "0.10.0" +kvdb-memorydb = "0.11.0" diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml index 686441352bbe..dea16e57a1e0 100644 --- a/node/core/dispute-coordinator/Cargo.toml +++ b/node/core/dispute-coordinator/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] futures = "0.3.21" tracing = "0.1.31" -parity-scale-codec = "2" -kvdb = "0.10.0" +parity-scale-codec = "3.0.0" +kvdb = "0.11.0" thiserror = "1.0.30" lru = "0.7.2" @@ -20,7 +20,7 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] -kvdb-memorydb = "0.10.0" +kvdb-memorydb = "0.11.0" polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml index ee486b3c66dd..51a7396a4f24 100644 --- a/node/core/pvf/Cargo.toml +++ b/node/core/pvf/Cargo.toml @@ -19,7 +19,7 @@ slotmap = "1.0" tracing = "0.1.31" pin-project = "1.0.9" rand = "0.8.5" -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } polkadot-parachain = { path = "../../../parachain" } polkadot-core-primitives = { path = "../../../core-primitives" } polkadot-node-subsystem-util = { path = "../../subsystem-util"} diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml index 143d7b5dca9a..f15a29471df8 100644 --- a/node/core/runtime-api/Cargo.toml +++ b/node/core/runtime-api/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" futures = "0.3.21" tracing = "0.1.31" memory-lru = "0.1.0" -parity-util-mem = { version = "0.10.0", default-features = false } +parity-util-mem = { version = "0.11.0", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/jaeger/Cargo.toml b/node/jaeger/Cargo.toml index d7a16098c190..2ce50ea53207 100644 --- a/node/jaeger/Cargo.toml +++ b/node/jaeger/Cargo.toml @@ -16,4 +16,4 @@ sc-network = { git = "https://github.com/paritytech/substrate", branch = "master sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } thiserror = "1.0.30" log = "0.4.13" -parity-scale-codec = { version = "2.3.1", default-features = false } +parity-scale-codec = { version = "3.0.0", default-features = false } diff --git a/node/malus/Cargo.toml b/node/malus/Cargo.toml index 8b72a4a6feac..e63954689841 100644 --- a/node/malus/Cargo.toml +++ b/node/malus/Cargo.toml @@ -23,7 +23,7 @@ polkadot-node-core-backing = { path = "../core/backing" } polkadot-node-primitives = { path = "../primitives" } polkadot-primitives = { path = "../../primitives" } polkadot-node-core-pvf = { path = "../core/pvf" } -parity-util-mem = { version = "0.10.0", default-features = false, features = ["jemalloc-global"] } +parity-util-mem = { version = "0.11.0", default-features = false, features = ["jemalloc-global"] } color-eyre = { version = "0.6.0", default-features = false } assert_matches = "1.5" async-trait = "0.1.52" diff --git a/node/metrics/Cargo.toml b/node/metrics/Cargo.toml index 4c0ad72bad2f..30165ce85101 100644 --- a/node/metrics/Cargo.toml +++ b/node/metrics/Cargo.toml @@ -18,7 +18,7 @@ sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } -codec = { package = "parity-scale-codec", version = "2.2.0" } +codec = { package = "parity-scale-codec", version = "3.0.0" } primitives = { package = "polkadot-primitives", path = "../../primitives/" } bs58 = { version = "0.4.0", features = ["alloc"] } log = "0.4.13" diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml index 41e8d4d40195..d2acd0eb00eb 100644 --- a/node/network/availability-distribution/Cargo.toml +++ b/node/network/availability-distribution/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] futures = "0.3.21" tracing = "0.1.31" -parity-scale-codec = { version = "2.3.1", features = ["std"] } +parity-scale-codec = { version = "3.0.0", features = ["std"] } polkadot-primitives = { path = "../../../primitives" } polkadot-erasure-coding = { path = "../../../erasure-coding" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } diff --git a/node/network/availability-recovery/Cargo.toml b/node/network/availability-recovery/Cargo.toml index 70756fefdab8..8eece0960e80 100644 --- a/node/network/availability-recovery/Cargo.toml +++ b/node/network/availability-recovery/Cargo.toml @@ -17,7 +17,7 @@ polkadot-node-primitives = { path = "../../primitives" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-network-protocol = { path = "../../network/protocol" } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } [dev-dependencies] diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml index 4062d463b8a7..a049bf146cb0 100644 --- a/node/network/bridge/Cargo.toml +++ b/node/network/bridge/Cargo.toml @@ -9,7 +9,7 @@ async-trait = "0.1.52" futures = "0.3.21" tracing = "0.1.31" polkadot-primitives = { path = "../../../primitives" } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml index 21ec6620cbf4..dddca4e00c94 100644 --- a/node/network/collator-protocol/Cargo.toml +++ b/node/network/collator-protocol/Cargo.toml @@ -30,7 +30,7 @@ assert_matches = "1.4.0" sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -parity-scale-codec = { version = "2.3.1", features = ["std"] } +parity-scale-codec = { version = "3.0.0", features = ["std"] } polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" } polkadot-primitives-test-helpers = { path = "../../../primitives/test-helpers" } diff --git a/node/network/dispute-distribution/Cargo.toml b/node/network/dispute-distribution/Cargo.toml index 7c2f0436d6da..a9c334118229 100644 --- a/node/network/dispute-distribution/Cargo.toml +++ b/node/network/dispute-distribution/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" futures = "0.3.21" tracing = "0.1.31" derive_more = "0.99.17" -parity-scale-codec = { version = "2.3.1", features = ["std"] } +parity-scale-codec = { version = "3.0.0", features = ["std"] } polkadot-primitives = { path = "../../../primitives" } polkadot-erasure-coding = { path = "../../../erasure-coding" } polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" } diff --git a/node/network/protocol/Cargo.toml b/node/network/protocol/Cargo.toml index a1bc6ac1f257..6305fb403f51 100644 --- a/node/network/protocol/Cargo.toml +++ b/node/network/protocol/Cargo.toml @@ -10,7 +10,7 @@ async-trait = "0.1.52" polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } polkadot-node-jaeger = { path = "../../jaeger" } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } strum = { version = "0.23", features = ["derive"] } diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml index 4a3a06a25a96..f04e88ca5607 100644 --- a/node/network/statement-distribution/Cargo.toml +++ b/node/network/statement-distribution/Cargo.toml @@ -17,7 +17,7 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" } polkadot-node-network-protocol = { path = "../../network/protocol" } arrayvec = "0.5.2" indexmap = "1.8.0" -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } derive_more = "0.99.17" thiserror = "1.0.30" diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 4392b6997d6f..d37ec2376579 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -18,7 +18,7 @@ polkadot-primitives = { path = "../../primitives" } polkadot-overseer-gen = { path = "./overseer-gen" } tracing = "0.1.31" lru = "0.7" -parity-util-mem = { version = ">= 0.10.1", default-features = false } +parity-util-mem = { version = "0.11.0", default-features = false } [dev-dependencies] metered-channel = { path = "../metered-channel" } diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index 96af76f07c4d..49305170cb77 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -9,7 +9,7 @@ description = "Primitives types for the Node-side" bounded-vec = "0.5" futures = "0.3.21" polkadot-primitives = { path = "../../primitives" } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus-vrf = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index b06b59339e8b..487910e0277d 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -66,8 +66,8 @@ hex-literal = "0.3.4" tracing = "0.1.31" serde = { version = "1.0.136", features = ["derive"] } thiserror = "1.0.30" -kvdb = "0.10.0" -kvdb-rocksdb = { version = "0.14.0", optional = true } +kvdb = "0.11.0" +kvdb-rocksdb = { version = "0.15.1", optional = true } async-trait = "0.1.52" lru = "0.7" diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml index 7b2596a5ac25..de10b89e85da 100644 --- a/node/subsystem-util/Cargo.toml +++ b/node/subsystem-util/Cargo.toml @@ -9,7 +9,7 @@ description = "Subsystem traits and message definitions" async-trait = "0.1.52" futures = "0.3.21" itertools = "0.10" -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } pin-project = "1.0.9" rand = "0.8.5" thiserror = "1.0.30" diff --git a/node/test/client/Cargo.toml b/node/test/client/Cargo.toml index e8f404ed870c..0f95d38fe56e 100644 --- a/node/test/client/Cargo.toml +++ b/node/test/client/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } # Polkadot dependencies polkadot-test-runtime = { path = "../../../runtime/test-runtime" } diff --git a/node/zombienet-backchannel/Cargo.toml b/node/zombienet-backchannel/Cargo.toml index aa5313509d0b..94da8808a435 100644 --- a/node/zombienet-backchannel/Cargo.toml +++ b/node/zombienet-backchannel/Cargo.toml @@ -14,7 +14,7 @@ url = "2.0.0" tokio-tungstenite = "0.16" futures-util = "0.3.21" lazy_static = "1.4.0" -parity-scale-codec = { version = "2.3.1", features = ["derive"] } +parity-scale-codec = { version = "3.0.0", features = ["derive"] } reqwest = "0.11" thiserror = "1.0.30" tracing = "0.1.31" diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 1cf1801f4a24..b6be402c71de 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -9,9 +9,9 @@ edition = "2018" # note: special care is taken to avoid inclusion of `sp-io` externals when compiling # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # various unnecessary Substrate-specific endpoints. -parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] } -parity-util-mem = { version = "0.10.0", default-features = false, optional = true } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = [ "derive" ] } +parity-util-mem = { version = "0.11.0", default-features = false, optional = true } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/parachain/test-parachains/Cargo.toml b/parachain/test-parachains/Cargo.toml index fc769e898dfb..7ac6009c59c3 100644 --- a/parachain/test-parachains/Cargo.toml +++ b/parachain/test-parachains/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] tiny-keccak = "2.0.2" -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } adder = { package = "test-parachain-adder", path = "adder" } halt = { package = "test-parachain-halt", path = "halt" } diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml index 781c27893584..a3c2a8e48c15 100644 --- a/parachain/test-parachains/adder/Cargo.toml +++ b/parachain/test-parachains/adder/Cargo.toml @@ -8,7 +8,7 @@ build = "build.rs" [dependencies] parachain = { package = "polkadot-parachain", path = "../../", default-features = false, features = [ "wasm-api" ] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } tiny-keccak = { version = "2.0.2", features = ["keccak"] } dlmalloc = { version = "0.2.3", features = [ "global" ] } diff --git a/parachain/test-parachains/adder/collator/Cargo.toml b/parachain/test-parachains/adder/collator/Cargo.toml index 4859d4655c7b..df9a074de332 100644 --- a/parachain/test-parachains/adder/collator/Cargo.toml +++ b/parachain/test-parachains/adder/collator/Cargo.toml @@ -14,7 +14,7 @@ name = "adder_collator_puppet_worker" path = "bin/puppet_worker.rs" [dependencies] -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } clap = { version = "3.0", features = ["derive"] } futures = "0.3.21" futures-timer = "3.0.2" diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index faf41737c0f9..59420cd387de 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" [dependencies] serde = { version = "1.0.136", optional = true, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["bit-vec", "derive"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["bit-vec", "derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["bit-vec", "derive"] } primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -27,7 +27,7 @@ trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", b bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } hex-literal = "0.3.4" -parity-util-mem = { version = "0.10.0", default-features = false, optional = true } +parity-util-mem = { version = "0.11.0", default-features = false, optional = true } [features] default = ["std"] diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index da760b960c87..46a9b38dd2b8 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -7,10 +7,10 @@ edition = "2018" [dependencies] impl-trait-for-tuples = "0.2.2" bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.13", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", default-features = false } serde_derive = { version = "1.0.117", optional = true } static_assertions = "1.1.0" diff --git a/runtime/common/slot_range_helper/Cargo.toml b/runtime/common/slot_range_helper/Cargo.toml index d728f7f7b1f4..f0f6e9db4ac8 100644 --- a/runtime/common/slot_range_helper/Cargo.toml +++ b/runtime/common/slot_range_helper/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] paste = "1.0" enumn = "0.1.3" -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 3615191879e5..00a6c7426d50 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -7,8 +7,8 @@ build = "build.rs" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.136", default-features = false } diff --git a/runtime/metrics/Cargo.toml b/runtime/metrics/Cargo.toml index 14aefaa2626f..0987064a9555 100644 --- a/runtime/metrics/Cargo.toml +++ b/runtime/metrics/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false} sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -parity-scale-codec = { version = "2.3.1", default-features = false } +parity-scale-codec = { version = "3.0.0", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] } diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index 028b749452d9..6d5804f0ac45 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -6,10 +6,10 @@ edition = "2018" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", features = [ "derive" ], optional = true } derive_more = "0.99.17" bitflags = "1.3.2" diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index f8f5a5d915bb..e581ee69a20b 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -7,8 +7,8 @@ build = "build.rs" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.136", default-features = false } diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml index ac92aeeb2b51..bf93a785ecc4 100644 --- a/runtime/rococo/Cargo.toml +++ b/runtime/rococo/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" build = "build.rs" [dependencies] -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", default-features = false } serde_derive = { version = "1.0.117", optional = true } smallvec = "1.8.0" diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index 45b434f0baa5..99df6bb9e74d 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -7,10 +7,10 @@ build = "build.rs" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", default-features = false } serde_derive = { version = "1.0.117", optional = true } smallvec = "1.8.0" diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index 37ad7429b4d0..748b31d010b3 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -7,8 +7,8 @@ build = "build.rs" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.136", default-features = false } diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index d4f95908775b..be6e746a37ad 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -5,6 +5,6 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } primitives = { package = "polkadot-primitives", path = "../primitives" } diff --git a/utils/staking-miner/Cargo.toml b/utils/staking-miner/Cargo.toml index 2a75c3007ce6..40472953a38e 100644 --- a/utils/staking-miner/Cargo.toml +++ b/utils/staking-miner/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] clap = { version = "3.0", features = ["derive", "env"] } -codec = { package = "parity-scale-codec", version = "2.0.0" } +codec = { package = "parity-scale-codec", version = "3.0.0" } tracing-subscriber = { version = "0.3.9", features = ["env-filter"] } jsonrpsee = { version = "0.8", features = ["ws-client", "macros"] } log = "0.4.11" diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 560df741b1b5..3fc4b0185cbf 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] impl-trait-for-tuples = "0.2.2" -parity-scale-codec = { version = "2.3.1", default-features = false, features = [ "derive" ] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = [ "derive" ] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } derivative = {version = "2.2.0", default-features = false, features = [ "use_core" ] } log = { version = "0.4.14", default-features = false } xcm-procedural = { path = "procedural" } diff --git a/xcm/pallet-xcm-benchmarks/Cargo.toml b/xcm/pallet-xcm-benchmarks/Cargo.toml index 0cc3c4bb0202..cb3af1ee0719 100644 --- a/xcm/pallet-xcm-benchmarks/Cargo.toml +++ b/xcm/pallet-xcm-benchmarks/Cargo.toml @@ -8,8 +8,8 @@ version = "0.9.17" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } frame-support = { default-features = false, branch = "master", git = "https://github.com/paritytech/substrate" } frame-system = { default-features = false, branch = "master", git = "https://github.com/paritytech/substrate" } sp-runtime = { default-features = false, branch = "master", git = "https://github.com/paritytech/substrate" } diff --git a/xcm/pallet-xcm/Cargo.toml b/xcm/pallet-xcm/Cargo.toml index b497f3a10f11..9d13fa2f7e96 100644 --- a/xcm/pallet-xcm/Cargo.toml +++ b/xcm/pallet-xcm/Cargo.toml @@ -5,8 +5,8 @@ name = "pallet-xcm" version = "0.9.17" [dependencies] -codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true, features = ["derive"] } log = { version = "0.4.14", default-features = false } diff --git a/xcm/xcm-builder/Cargo.toml b/xcm/xcm-builder/Cargo.toml index 36be7d2e41d5..ee272f9cacb7 100644 --- a/xcm/xcm-builder/Cargo.toml +++ b/xcm/xcm-builder/Cargo.toml @@ -6,8 +6,8 @@ description = "Tools & types for building with XCM and its executor." version = "0.9.17" [dependencies] -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } xcm = { path = "..", default-features = false } xcm-executor = { path = "../xcm-executor", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/xcm/xcm-executor/Cargo.toml b/xcm/xcm-executor/Cargo.toml index ac4f1fea5172..ce8cee7de351 100644 --- a/xcm/xcm-executor/Cargo.toml +++ b/xcm/xcm-executor/Cargo.toml @@ -7,7 +7,7 @@ version = "0.9.17" [dependencies] impl-trait-for-tuples = "0.2.2" -parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } xcm = { path = "..", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/xcm/xcm-simulator/Cargo.toml b/xcm/xcm-simulator/Cargo.toml index e3904603b90e..e028045678e5 100644 --- a/xcm/xcm-simulator/Cargo.toml +++ b/xcm/xcm-simulator/Cargo.toml @@ -6,7 +6,7 @@ description = "Test kit to simulate cross-chain message passing and XCM executio edition = "2018" [dependencies] -codec = { package = "parity-scale-codec", version = "2.0.0" } +codec = { package = "parity-scale-codec", version = "3.0.0" } paste = "1.0.6" frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/xcm/xcm-simulator/example/Cargo.toml b/xcm/xcm-simulator/example/Cargo.toml index e4348c838df4..c121878a07b6 100644 --- a/xcm/xcm-simulator/example/Cargo.toml +++ b/xcm/xcm-simulator/example/Cargo.toml @@ -6,8 +6,8 @@ description = "Examples of xcm-simulator usage." edition = "2018" [dependencies] -codec = { package = "parity-scale-codec", version = "2.0.0" } -scale-info = { version = "1.0", features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0" } +scale-info = { version = "2.0.0", features = ["derive"] } frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/xcm/xcm-simulator/fuzzer/Cargo.toml b/xcm/xcm-simulator/fuzzer/Cargo.toml index c6b0552d0768..b71c8c02272f 100644 --- a/xcm/xcm-simulator/fuzzer/Cargo.toml +++ b/xcm/xcm-simulator/fuzzer/Cargo.toml @@ -6,9 +6,9 @@ description = "Examples of xcm-simulator usage." edition = "2018" [dependencies] -codec = { package = "parity-scale-codec", version = "2.0.0" } +codec = { package = "parity-scale-codec", version = "3.0.0" } honggfuzz = "0.5.54" -scale-info = { version = "1.0", features = ["derive"] } +scale-info = { version = "2.0.0", features = ["derive"] } frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" } From 7a49dcac07f957c03a894b6929cff08d2661c838 Mon Sep 17 00:00:00 2001 From: Wigy Date: Tue, 22 Feb 2022 09:50:21 +0100 Subject: [PATCH 2/8] Adapting code to scale v3 --- bridges/bin/millau/runtime/src/lib.rs | 2 -- bridges/bin/rialto/runtime/src/lib.rs | 2 -- bridges/primitives/chain-kusama/src/lib.rs | 2 -- bridges/primitives/chain-millau/src/lib.rs | 2 -- bridges/primitives/chain-polkadot/src/lib.rs | 2 -- bridges/primitives/chain-rialto-parachain/src/lib.rs | 2 -- bridges/primitives/chain-rialto/src/lib.rs | 2 -- bridges/primitives/chain-rococo/src/lib.rs | 2 -- bridges/primitives/chain-westend/src/lib.rs | 2 -- bridges/primitives/chain-wococo/src/lib.rs | 2 -- bridges/primitives/messages/src/lib.rs | 2 -- runtime/parachains/src/ump.rs | 4 ++-- xcm/xcm-simulator/fuzzer/src/fuzz.rs | 4 ++-- 13 files changed, 4 insertions(+), 26 deletions(-) diff --git a/bridges/bin/millau/runtime/src/lib.rs b/bridges/bin/millau/runtime/src/lib.rs index d698df0f47ed..97fe4d49bc5f 100644 --- a/bridges/bin/millau/runtime/src/lib.rs +++ b/bridges/bin/millau/runtime/src/lib.rs @@ -21,8 +21,6 @@ #![recursion_limit = "256"] // Runtime-generated enums #![allow(clippy::large_enum_variant)] -// Runtime-generated DecodeLimit::decode_all_With_depth_limit -#![allow(clippy::unnecessary_mut_passed)] // From construct_runtime macro #![allow(clippy::from_over_into)] diff --git a/bridges/bin/rialto/runtime/src/lib.rs b/bridges/bin/rialto/runtime/src/lib.rs index 0d48b96c6548..75f7eabe8d27 100644 --- a/bridges/bin/rialto/runtime/src/lib.rs +++ b/bridges/bin/rialto/runtime/src/lib.rs @@ -21,8 +21,6 @@ #![recursion_limit = "256"] // Runtime-generated enums #![allow(clippy::large_enum_variant)] -// Runtime-generated DecodeLimit::decode_all_With_depth_limit -#![allow(clippy::unnecessary_mut_passed)] // From construct_runtime macro #![allow(clippy::from_over_into)] diff --git a/bridges/primitives/chain-kusama/src/lib.rs b/bridges/primitives/chain-kusama/src/lib.rs index 9a6eb66d2286..c01f5691d408 100644 --- a/bridges/primitives/chain-kusama/src/lib.rs +++ b/bridges/primitives/chain-kusama/src/lib.rs @@ -17,8 +17,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // RuntimeApi generated functions #![allow(clippy::too_many_arguments)] -// Runtime-generated DecodeLimit::decode_all_with_depth_limit -#![allow(clippy::unnecessary_mut_passed)] use bp_messages::{LaneId, MessageDetails, MessageNonce, UnrewardedRelayersState}; use frame_support::weights::{ diff --git a/bridges/primitives/chain-millau/src/lib.rs b/bridges/primitives/chain-millau/src/lib.rs index 0092f7092bc0..f86430fe9b23 100644 --- a/bridges/primitives/chain-millau/src/lib.rs +++ b/bridges/primitives/chain-millau/src/lib.rs @@ -17,8 +17,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // RuntimeApi generated functions #![allow(clippy::too_many_arguments)] -// Runtime-generated DecodeLimit::decode_all_With_depth_limit -#![allow(clippy::unnecessary_mut_passed)] mod millau_hash; diff --git a/bridges/primitives/chain-polkadot/src/lib.rs b/bridges/primitives/chain-polkadot/src/lib.rs index 26bad1ea8656..2e2bdaa90cb5 100644 --- a/bridges/primitives/chain-polkadot/src/lib.rs +++ b/bridges/primitives/chain-polkadot/src/lib.rs @@ -17,8 +17,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // RuntimeApi generated functions #![allow(clippy::too_many_arguments)] -// Runtime-generated DecodeLimit::decode_all_with_depth_limit -#![allow(clippy::unnecessary_mut_passed)] use bp_messages::{LaneId, MessageDetails, MessageNonce, UnrewardedRelayersState}; use frame_support::weights::{ diff --git a/bridges/primitives/chain-rialto-parachain/src/lib.rs b/bridges/primitives/chain-rialto-parachain/src/lib.rs index 826f6d39bd7f..70da878ff907 100644 --- a/bridges/primitives/chain-rialto-parachain/src/lib.rs +++ b/bridges/primitives/chain-rialto-parachain/src/lib.rs @@ -17,8 +17,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // RuntimeApi generated functions #![allow(clippy::too_many_arguments)] -// Runtime-generated DecodeLimit::decode_all_With_depth_limit -#![allow(clippy::unnecessary_mut_passed)] use bp_runtime::Chain; use frame_support::{ diff --git a/bridges/primitives/chain-rialto/src/lib.rs b/bridges/primitives/chain-rialto/src/lib.rs index 6c4e48301e3b..30269a65b821 100644 --- a/bridges/primitives/chain-rialto/src/lib.rs +++ b/bridges/primitives/chain-rialto/src/lib.rs @@ -17,8 +17,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // RuntimeApi generated functions #![allow(clippy::too_many_arguments)] -// Runtime-generated DecodeLimit::decode_all_With_depth_limit -#![allow(clippy::unnecessary_mut_passed)] use bp_messages::{LaneId, MessageDetails, MessageNonce, UnrewardedRelayersState}; use bp_runtime::Chain; diff --git a/bridges/primitives/chain-rococo/src/lib.rs b/bridges/primitives/chain-rococo/src/lib.rs index 55741952c5c3..8cd22eef6095 100644 --- a/bridges/primitives/chain-rococo/src/lib.rs +++ b/bridges/primitives/chain-rococo/src/lib.rs @@ -17,8 +17,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // RuntimeApi generated functions #![allow(clippy::too_many_arguments)] -// Runtime-generated DecodeLimit::decode_all_with_depth_limit -#![allow(clippy::unnecessary_mut_passed)] use bp_messages::{LaneId, MessageDetails, MessageNonce, UnrewardedRelayersState}; use frame_support::weights::{ diff --git a/bridges/primitives/chain-westend/src/lib.rs b/bridges/primitives/chain-westend/src/lib.rs index 8beb897f59a1..7c9b2b65deba 100644 --- a/bridges/primitives/chain-westend/src/lib.rs +++ b/bridges/primitives/chain-westend/src/lib.rs @@ -17,8 +17,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // RuntimeApi generated functions #![allow(clippy::too_many_arguments)] -// Runtime-generated DecodeLimit::decode_all_with_depth_limit -#![allow(clippy::unnecessary_mut_passed)] use bp_messages::{LaneId, MessageDetails, MessageNonce, UnrewardedRelayersState}; use frame_support::weights::{ diff --git a/bridges/primitives/chain-wococo/src/lib.rs b/bridges/primitives/chain-wococo/src/lib.rs index fe2ce3a309a6..d071cf8279ea 100644 --- a/bridges/primitives/chain-wococo/src/lib.rs +++ b/bridges/primitives/chain-wococo/src/lib.rs @@ -17,8 +17,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // RuntimeApi generated functions #![allow(clippy::too_many_arguments)] -// Runtime-generated DecodeLimit::decode_all_with_depth_limit -#![allow(clippy::unnecessary_mut_passed)] use bp_messages::{LaneId, MessageDetails, MessageNonce, UnrewardedRelayersState}; use sp_std::prelude::*; diff --git a/bridges/primitives/messages/src/lib.rs b/bridges/primitives/messages/src/lib.rs index abefe8d789b8..ee0e0ce6d1a0 100644 --- a/bridges/primitives/messages/src/lib.rs +++ b/bridges/primitives/messages/src/lib.rs @@ -19,8 +19,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // RuntimeApi generated functions #![allow(clippy::too_many_arguments)] -// Generated by `DecodeLimit::decode_with_depth_limit` -#![allow(clippy::unnecessary_mut_passed)] use bitvec::prelude::*; use bp_runtime::messages::DispatchFeePayment; diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs index 344b0f7d439f..10a16bb0a143 100644 --- a/runtime/parachains/src/ump.rs +++ b/runtime/parachains/src/ump.rs @@ -89,7 +89,7 @@ fn upward_message_id(data: &[u8]) -> MessageId { impl, C: Config> UmpSink for XcmSink { fn process_upward_message( origin: ParaId, - data: &[u8], + mut data: &[u8], max_weight: Weight, ) -> Result { use parity_scale_codec::DecodeLimit; @@ -101,7 +101,7 @@ impl, C: Config> UmpSink for XcmSi let id = upward_message_id(&data[..]); let maybe_msg = VersionedXcm::::decode_all_with_depth_limit( xcm::MAX_XCM_DECODE_DEPTH, - &mut &data[..], + &mut data, ) .map(Xcm::::try_from); match maybe_msg { diff --git a/xcm/xcm-simulator/fuzzer/src/fuzz.rs b/xcm/xcm-simulator/fuzzer/src/fuzz.rs index 643fca703782..4da7de2f3d1b 100644 --- a/xcm/xcm-simulator/fuzzer/src/fuzz.rs +++ b/xcm/xcm-simulator/fuzzer/src/fuzz.rs @@ -104,9 +104,9 @@ pub fn relay_ext() -> sp_io::TestExternalities { pub type RelayChainPalletXcm = pallet_xcm::Pallet; pub type ParachainPalletXcm = pallet_xcm::Pallet; -fn run_one_input(data: &[u8]) { +fn run_one_input(mut data: &[u8]) { MockNet::reset(); - if let Ok(m) = Xcm::decode_all_with_depth_limit(MAX_XCM_DECODE_DEPTH, data) { + if let Ok(m) = Xcm::decode_all_with_depth_limit(MAX_XCM_DECODE_DEPTH, &mut data) { #[cfg(not(fuzzing))] { println!("Executing message {:?}", m); From 07249f9ecb1220d237f0909081d5e2ee1c5038cf Mon Sep 17 00:00:00 2001 From: Wigy Date: Wed, 23 Feb 2022 10:13:47 +0100 Subject: [PATCH 3/8] Upgrade bitvec to 1.0.0 --- Cargo.lock | 553 ++++++++++-------- bridges/modules/messages/Cargo.toml | 2 +- bridges/modules/messages/src/mock.rs | 2 +- bridges/modules/messages/src/outbound_lane.rs | 2 +- bridges/primitives/messages/Cargo.toml | 2 +- bridges/primitives/messages/src/lib.rs | 6 +- node/core/approval-voting/Cargo.toml | 2 +- .../approval-voting/src/approval_checking.rs | 48 +- .../approval-voting/src/approval_db/v1/mod.rs | 2 +- .../src/approval_db/v1/tests.rs | 4 +- node/core/approval-voting/src/import.rs | 4 +- node/core/approval-voting/src/lib.rs | 4 +- node/core/approval-voting/src/ops.rs | 4 +- .../approval-voting/src/persisted_entries.rs | 14 +- node/core/av-store/Cargo.toml | 2 +- node/core/av-store/src/lib.rs | 6 +- node/core/av-store/src/tests.rs | 6 +- node/core/backing/Cargo.toml | 2 +- node/core/backing/src/tests.rs | 4 +- node/core/provisioner/Cargo.toml | 2 +- node/core/provisioner/src/lib.rs | 2 +- node/core/provisioner/src/tests.rs | 4 +- node/network/bitfield-distribution/Cargo.toml | 2 +- .../bitfield-distribution/src/tests.rs | 12 +- primitives/Cargo.toml | 2 +- primitives/src/v0.rs | 2 +- primitives/src/v1/mod.rs | 14 +- runtime/common/Cargo.toml | 2 +- runtime/kusama/Cargo.toml | 2 +- runtime/parachains/Cargo.toml | 2 +- runtime/parachains/src/builder.rs | 12 +- runtime/parachains/src/disputes.rs | 34 +- runtime/parachains/src/disputes/tests.rs | 92 +-- runtime/parachains/src/inclusion/mod.rs | 20 +- runtime/parachains/src/inclusion/tests.rs | 14 +- runtime/parachains/src/paras/mod.rs | 8 +- runtime/parachains/src/paras_inherent/mod.rs | 10 +- .../parachains/src/paras_inherent/tests.rs | 6 +- runtime/polkadot/Cargo.toml | 2 +- runtime/test-runtime/Cargo.toml | 2 +- runtime/westend/Cargo.toml | 2 +- 41 files changed, 499 insertions(+), 418 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 217a89d37b1b..dd0062e923b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -439,14 +439,13 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "beefy-primitives", "fnv", "futures 0.3.21", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", "sc-keystore", @@ -468,7 +467,6 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -479,7 +477,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-rpc", "sc-utils", "serde", @@ -491,12 +489,10 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "scale-info", @@ -549,9 +545,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.20.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ "funty", "radium", @@ -907,6 +903,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cache-padded" version = "1.1.1" @@ -1820,9 +1827,9 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" dependencies = [ "either", "futures 0.3.21", @@ -1889,7 +1896,6 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", ] @@ -1907,7 +1913,6 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -1929,7 +1934,6 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "Inflector", "chrono", @@ -1956,7 +1960,6 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -1970,7 +1973,6 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -1985,9 +1987,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" +checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", "parity-scale-codec", @@ -1998,7 +2000,6 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "bitflags", "frame-metadata", @@ -2027,7 +2028,6 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2039,7 +2039,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.2", @@ -2051,7 +2050,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "proc-macro2", "quote", @@ -2061,7 +2059,6 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2084,7 +2081,6 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -2095,7 +2091,6 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "log", @@ -2112,7 +2107,6 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -2127,7 +2121,6 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "sp-api", @@ -2136,7 +2129,6 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "sp-api", @@ -2196,9 +2188,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "funty" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -2332,7 +2324,6 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "chrono", "frame-election-provider-support", @@ -2778,9 +2769,9 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ "parity-scale-codec", ] @@ -3347,9 +3338,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" +checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" dependencies = [ "parity-util-mem", "smallvec", @@ -3357,20 +3348,20 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" +checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "kvdb-rocksdb" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" +checksum = "a1e72a631a32527fafe22d0751c002e67d28173c49dcaecf79d1aaa323c520e9" dependencies = [ "fs-swap", "kvdb", @@ -3378,7 +3369,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rocksdb", "smallvec", @@ -3914,14 +3905,17 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "6.20.3" +version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "tikv-jemalloc-sys", ] [[package]] @@ -4180,12 +4174,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626" +checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ "hash-db", - "hashbrown 0.11.2", + "hashbrown 0.12.0", "parity-util-mem", ] @@ -4752,7 +4746,6 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4766,7 +4759,6 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -4782,7 +4774,6 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -4797,7 +4788,6 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4821,7 +4811,6 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4841,7 +4830,6 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-election-provider-support", "frame-support", @@ -4861,7 +4849,6 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4876,7 +4863,6 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "beefy-primitives", "frame-support", @@ -4892,7 +4878,6 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4917,7 +4902,6 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5001,7 +4985,6 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5018,7 +5001,6 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5034,7 +5016,6 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5057,7 +5038,6 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5075,7 +5055,6 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5090,7 +5069,6 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5113,7 +5091,6 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5129,7 +5106,6 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5149,7 +5125,6 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5166,7 +5141,6 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5183,7 +5157,6 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5201,7 +5174,6 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -5217,7 +5189,6 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5234,7 +5205,6 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5249,7 +5219,6 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -5263,7 +5232,6 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -5280,7 +5248,6 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5303,7 +5270,6 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5319,7 +5285,6 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5334,7 +5299,6 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -5348,7 +5312,6 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5364,7 +5327,6 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -5385,7 +5347,6 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5401,7 +5362,6 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -5415,7 +5375,6 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5438,7 +5397,6 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "proc-macro-crate 1.1.2", "proc-macro2", @@ -5449,7 +5407,6 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "log", "sp-arithmetic", @@ -5458,7 +5415,6 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -5472,7 +5428,6 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5490,7 +5445,6 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5509,7 +5463,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-support", "frame-system", @@ -5526,7 +5479,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5543,7 +5495,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5554,7 +5505,6 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5571,7 +5521,6 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5587,7 +5536,6 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5667,9 +5615,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "2.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +checksum = "2a7f3fcf5e45fc28b84dcdab6b983e77f197ec01f325a33f404ba6855afd1070" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -5681,9 +5629,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +checksum = "2c6e626dc84025ff56bf1476ed0e30d10c84d7f89a475ef46ebabee1095a8fba" dependencies = [ "proc-macro-crate 1.1.2", "proc-macro2", @@ -5713,15 +5661,15 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" +checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.11.2", + "hashbrown 0.12.0", "impl-trait-for-tuples", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "smallvec", "tikv-jemalloc-ctl", @@ -7557,9 +7505,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", @@ -7741,9 +7689,9 @@ dependencies = [ [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -7990,7 +7938,6 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "env_logger 0.9.0", "jsonrpsee 0.8.0", @@ -8082,9 +8029,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" dependencies = [ "libc", "librocksdb-sys", @@ -8337,7 +8284,6 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "log", "sp-core", @@ -8348,7 +8294,6 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "futures 0.3.21", @@ -8375,7 +8320,6 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8398,7 +8342,6 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8414,7 +8357,6 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8431,7 +8373,6 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "proc-macro-crate 1.1.2", "proc-macro2", @@ -8442,7 +8383,6 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "chrono", "clap", @@ -8480,14 +8420,13 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "fnv", "futures 0.3.21", "hash-db", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -8508,7 +8447,6 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "hash-db", "kvdb", @@ -8518,7 +8456,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -8533,14 +8471,13 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-utils", "serde", @@ -8557,7 +8494,6 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "fork-tree", @@ -8568,7 +8504,7 @@ dependencies = [ "num-rational 0.2.4", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -8600,7 +8536,6 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -8624,7 +8559,6 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8637,7 +8571,6 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "futures 0.3.21", @@ -8662,7 +8595,6 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "sc-client-api", "sp-authorship", @@ -8673,14 +8605,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "lazy_static", "libsecp256k1", - "log", "lru 0.6.6", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -8695,13 +8625,13 @@ dependencies = [ "sp-trie", "sp-version", "sp-wasm-interface", + "tracing", "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "environmental", "parity-scale-codec", @@ -8718,7 +8648,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "log", "parity-scale-codec", @@ -8734,7 +8663,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8752,7 +8680,6 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "ahash", "async-trait", @@ -8763,7 +8690,7 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.8.5", "sc-block-builder", "sc-chain-spec", @@ -8791,7 +8718,6 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -8815,7 +8741,6 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "ansi_term", "futures 0.3.21", @@ -8832,11 +8757,10 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "hex", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde_json", "sp-application-crypto", "sp-core", @@ -8847,7 +8771,6 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-std", "async-trait", @@ -8868,7 +8791,7 @@ dependencies = [ "log", "lru 0.7.2", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "prost", "prost-build", @@ -8897,7 +8820,6 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "ahash", "futures 0.3.21", @@ -8914,7 +8836,6 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "bytes 1.1.0", "fnv", @@ -8926,7 +8847,7 @@ dependencies = [ "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", "sc-network", @@ -8942,7 +8863,6 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "libp2p", @@ -8955,7 +8875,6 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8964,7 +8883,6 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "hash-db", @@ -8972,7 +8890,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -8995,7 +8913,6 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9004,7 +8921,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", "serde", @@ -9020,7 +8937,6 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9037,7 +8953,6 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "directories", @@ -9050,7 +8965,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", @@ -9101,13 +9016,12 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "log", "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sp-core", ] @@ -9115,7 +9029,6 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9136,13 +9049,12 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "chrono", "futures 0.3.21", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "serde", @@ -9154,7 +9066,6 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "ansi_term", "atty", @@ -9163,7 +9074,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rustc-hash", "sc-client-api", @@ -9185,7 +9096,6 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "proc-macro-crate 1.1.2", "proc-macro2", @@ -9196,7 +9106,6 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9204,7 +9113,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -9223,7 +9132,6 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "log", @@ -9236,20 +9144,19 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "futures-timer", "lazy_static", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "prometheus", ] [[package]] name = "scale-info" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" +checksum = "7d3b4d0b178e3af536f7988303bc73a0766c816de2138c08262015f8ec7be568" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -9261,9 +9168,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" +checksum = "b7805950c36512db9e3251c970bb7ac425f326716941862205d612ab3b5e46e2" dependencies = [ "proc-macro-crate 1.1.2", "proc-macro2", @@ -9685,7 +9592,6 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "hash-db", "log", @@ -9702,7 +9608,6 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "blake2 0.10.2", "proc-macro-crate 1.1.2", @@ -9714,7 +9619,6 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "scale-info", @@ -9727,7 +9631,6 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "integer-sqrt", "num-traits", @@ -9742,7 +9645,6 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "scale-info", @@ -9755,7 +9657,6 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "parity-scale-codec", @@ -9767,7 +9668,6 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "sp-api", @@ -9779,13 +9679,12 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "log", "lru 0.7.2", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sp-api", "sp-consensus", "sp-database", @@ -9797,7 +9696,6 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "futures 0.3.21", @@ -9816,7 +9714,6 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "merlin", @@ -9839,7 +9736,6 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "scale-info", @@ -9851,7 +9747,6 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9863,7 +9758,6 @@ dependencies = [ [[package]] name = "sp-core" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "base58", "bitflags", @@ -9883,7 +9777,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "rand 0.7.3", "regex", @@ -9908,7 +9802,6 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "blake2 0.10.2", "byteorder", @@ -9922,7 +9815,6 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "proc-macro2", "quote", @@ -9933,16 +9825,14 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "kvdb", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "proc-macro2", "quote", @@ -9952,7 +9842,6 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "environmental", "parity-scale-codec", @@ -9963,7 +9852,6 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "finality-grandpa", "log", @@ -9981,7 +9869,6 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9995,14 +9882,13 @@ dependencies = [ [[package]] name = "sp-io" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "hash-db", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sp-core", "sp-externalities", "sp-keystore", @@ -10019,7 +9905,6 @@ dependencies = [ [[package]] name = "sp-keyring" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "lazy_static", "sp-core", @@ -10030,13 +9915,12 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "futures 0.3.21", "merlin", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "schnorrkel", "serde", "sp-core", @@ -10047,7 +9931,6 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "thiserror", "zstd", @@ -10056,7 +9939,6 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "scale-info", @@ -10071,7 +9953,6 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "proc-macro-crate 1.1.2", "proc-macro2", @@ -10082,7 +9963,6 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "sp-api", "sp-core", @@ -10092,7 +9972,6 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "backtrace", "lazy_static", @@ -10102,7 +9981,6 @@ dependencies = [ [[package]] name = "sp-rpc" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "rustc-hash", "serde", @@ -10112,7 +9990,6 @@ dependencies = [ [[package]] name = "sp-runtime" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "either", "hash256-std-hasher", @@ -10134,7 +10011,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10151,7 +10027,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "Inflector", "proc-macro-crate 1.1.2", @@ -10163,7 +10038,6 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "serde", "serde_json", @@ -10172,7 +10046,6 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "scale-info", @@ -10186,7 +10059,6 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "scale-info", @@ -10197,13 +10069,12 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "hash-db", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", "sp-core", @@ -10220,12 +10091,10 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" [[package]] name = "sp-storage" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10238,7 +10107,6 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "log", "sp-core", @@ -10251,7 +10119,6 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "futures-timer", @@ -10267,7 +10134,6 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "sp-std", @@ -10279,7 +10145,6 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "sp-api", "sp-runtime", @@ -10288,7 +10153,6 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "log", @@ -10304,7 +10168,6 @@ dependencies = [ [[package]] name = "sp-trie" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "hash-db", "memory-db", @@ -10319,7 +10182,6 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10336,7 +10198,6 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10347,7 +10208,6 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "impl-trait-for-tuples", "log", @@ -10515,7 +10375,6 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "platforms", ] @@ -10523,7 +10382,6 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -10545,7 +10403,6 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-std", "futures-util", @@ -10559,7 +10416,6 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "async-trait", "futures 0.3.21", @@ -10585,7 +10441,6 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "futures 0.3.21", "substrate-test-utils-derive", @@ -10595,7 +10450,6 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "proc-macro-crate 1.1.2", "proc-macro2", @@ -10606,7 +10460,6 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "ansi_term", "build-helper", @@ -11201,7 +11054,6 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#5cdbaa3e1caac94fa3ede30f9fb08fd1f031b3d4" dependencies = [ "clap", "jsonrpsee 0.4.1", @@ -12067,9 +11919,12 @@ dependencies = [ [[package]] name = "wyz" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +dependencies = [ + "tap", +] [[package]] name = "x25519-dalek" @@ -12307,3 +12162,239 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "chain-spec-builder" +version = "2.0.0" + +[[patch.unused]] +name = "frame-support-test-compile-pass" +version = "4.0.0-dev" + +[[patch.unused]] +name = "node-bench" +version = "0.9.0-dev" + +[[patch.unused]] +name = "node-cli" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-executor" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-inspect" +version = "0.9.0-dev" + +[[patch.unused]] +name = "node-primitives" +version = "2.0.0" + +[[patch.unused]] +name = "node-rpc" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-runtime" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-runtime-generate-bags" +version = "3.0.0" + +[[patch.unused]] +name = "node-template" +version = "4.0.0-dev" + +[[patch.unused]] +name = "node-template-runtime" +version = "4.0.0-dev" + +[[patch.unused]] +name = "node-testing" +version = "3.0.0-dev" + +[[patch.unused]] +name = "pallet-asset-tx-payment" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-atomic-swap" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-aura" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-bags-list-fuzzer" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-child-bounties" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-contracts" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-contracts-primitives" +version = "5.0.0" + +[[patch.unused]] +name = "pallet-contracts-proc-macro" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-contracts-rpc" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-contracts-rpc-runtime-api" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-conviction-voting" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-example-basic" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-example-offchain-worker" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-example-parallel" +version = "3.0.0-dev" + +[[patch.unused]] +name = "pallet-lottery" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-node-authorization" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-randomness-collective-flip" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-referenda" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-scored-pool" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-template" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-transaction-storage" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-uniques" +version = "4.0.0-dev" + +[[patch.unused]] +name = "sc-consensus-aura" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sc-consensus-manual-seal" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sc-consensus-pow" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sc-network-test" +version = "0.8.0" + +[[patch.unused]] +name = "sc-runtime-test" +version = "2.0.0" + +[[patch.unused]] +name = "sc-service-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-api-test" +version = "2.0.1" + +[[patch.unused]] +name = "sp-application-crypto-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-arithmetic-fuzzer" +version = "2.0.0" + +[[patch.unused]] +name = "sp-consensus-aura" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sp-consensus-pow" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sp-npos-elections-fuzzer" +version = "2.0.0-alpha.5" + +[[patch.unused]] +name = "sp-runtime-interface-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-runtime-interface-test-wasm" +version = "2.0.0" + +[[patch.unused]] +name = "sp-runtime-interface-test-wasm-deprecated" +version = "2.0.0" + +[[patch.unused]] +name = "sp-sandbox" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sp-test-primitives" +version = "2.0.0" + +[[patch.unused]] +name = "subkey" +version = "2.0.1" + +[[patch.unused]] +name = "substrate-frame-cli" +version = "4.0.0-dev" + +[[patch.unused]] +name = "substrate-frame-rpc-support" +version = "3.0.0" + +[[patch.unused]] +name = "substrate-test-runtime" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-runtime-client" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-runtime-transaction-pool" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-utils-test-crate" +version = "0.1.0" diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml index 9aa83399c6f2..ef7bf5535543 100644 --- a/bridges/modules/messages/Cargo.toml +++ b/bridges/modules/messages/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -bitvec = { version = "0.20", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } log = { version = "0.4.14", default-features = false } num-traits = { version = "0.2", default-features = false } diff --git a/bridges/modules/messages/src/mock.rs b/bridges/modules/messages/src/mock.rs index ef5081472279..01b51e6dda3a 100644 --- a/bridges/modules/messages/src/mock.rs +++ b/bridges/modules/messages/src/mock.rs @@ -530,7 +530,7 @@ pub fn unrewarded_relayer( begin, end, dispatch_results: if end >= begin { - bitvec![Msb0, u8; 1; (end - begin + 1) as _] + bitvec![u8, Msb0; 1; (end - begin + 1) as _] } else { Default::default() }, diff --git a/bridges/modules/messages/src/outbound_lane.rs b/bridges/modules/messages/src/outbound_lane.rs index c05437596db8..cfdc81acc315 100644 --- a/bridges/modules/messages/src/outbound_lane.rs +++ b/bridges/modules/messages/src/outbound_lane.rs @@ -260,7 +260,7 @@ mod tests { DeliveredMessages { begin: *nonces.start(), end: *nonces.end(), - dispatch_results: bitvec![Msb0, u8; 1; (nonces.end() - nonces.start() + 1) as _], + dispatch_results: bitvec![u8, Msb0; 1; (nonces.end() - nonces.start() + 1) as _], } } diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml index 9b84a4a5831a..1271ce616c94 100644 --- a/bridges/primitives/messages/Cargo.toml +++ b/bridges/primitives/messages/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -bitvec = { version = "0.20", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "bit-vec"] } impl-trait-for-tuples = "0.2" scale-info = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] } diff --git a/bridges/primitives/messages/src/lib.rs b/bridges/primitives/messages/src/lib.rs index ee0e0ce6d1a0..8e893fab1dd7 100644 --- a/bridges/primitives/messages/src/lib.rs +++ b/bridges/primitives/messages/src/lib.rs @@ -191,7 +191,7 @@ pub struct MessageDetails { } /// Bit vector of message dispatch results. -pub type DispatchResultsBitVec = BitVec; +pub type DispatchResultsBitVec = BitVec; /// Unrewarded relayer entry stored in the inbound lane data. /// @@ -225,7 +225,7 @@ impl DeliveredMessages { DeliveredMessages { begin: nonce, end: nonce, - dispatch_results: bitvec![Msb0, u8; if dispatch_result { 1 } else { 0 }], + dispatch_results: if dispatch_result { bitvec![u8, Msb0; 1] } else { bitvec![u8, Msb0; 0] }, } } @@ -391,7 +391,7 @@ mod tests { #[test] fn message_dispatch_result_works() { let delivered_messages = - DeliveredMessages { begin: 100, end: 150, dispatch_results: bitvec![Msb0, u8; 1; 151] }; + DeliveredMessages { begin: 100, end: 150, dispatch_results: bitvec![u8, Msb0; 1; 151] }; assert!(!delivered_messages.contains_message(99)); assert!(delivered_messages.contains_message(100)); diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml index 71d121d901e8..65072ec65664 100644 --- a/node/core/approval-voting/Cargo.toml +++ b/node/core/approval-voting/Cargo.toml @@ -9,7 +9,7 @@ futures = "0.3.21" futures-timer = "3.0.2" parity-scale-codec = { version = "3.0.0", default-features = false, features = ["bit-vec", "derive"] } tracing = "0.1.31" -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } lru = "0.7" merlin = "2.0" schnorrkel = "0.9.1" diff --git a/node/core/approval-voting/src/approval_checking.rs b/node/core/approval-voting/src/approval_checking.rs index d41bee800d2d..99af51b11867 100644 --- a/node/core/approval-voting/src/approval_checking.rs +++ b/node/core/approval-voting/src/approval_checking.rs @@ -129,7 +129,7 @@ pub fn check_approval( let n_assigned = assigned_mask.count_ones(); // Filter the amount of assigned validators by those which have approved. - assigned_mask &= approvals.iter().by_val(); + assigned_mask &= approvals; let n_approved = assigned_mask.count_ones(); // note: the process of computing `required` only chooses `exact` if @@ -326,7 +326,7 @@ fn filled_tranche_iterator<'a>( /// - if `tick` > `clock_drift`: the value is equal to `tick` + `no_show_duration`. fn count_no_shows( assignments: &[(ValidatorIndex, Tick)], - approvals: &BitSlice, + approvals: &BitSlice, clock_drift: Tick, block_tick: Tick, no_show_duration: Tick, @@ -367,7 +367,7 @@ fn count_no_shows( /// Determine the amount of tranches of assignments needed to determine approval of a candidate. pub fn tranches_to_approve( approval_entry: &ApprovalEntry, - approvals: &BitSlice, + approvals: &BitSlice, tranche_now: DelayTranche, block_tick: Tick, no_show_duration: Tick, @@ -501,7 +501,7 @@ mod tests { candidate: dummy_candidate_receipt(dummy_hash()), session: 0, block_assignments: BTreeMap::default(), - approvals: bitvec![BitOrderLsb0, u8; 0; 10], + approvals: bitvec![u8, BitOrderLsb0; 0; 10], } .into(); @@ -524,7 +524,7 @@ mod tests { assignments: (5..10).map(|i| (ValidatorIndex(i), 0.into())).collect(), }, ], - assignments: bitvec![BitOrderLsb0, u8; 1; 10], + assignments: bitvec![u8, BitOrderLsb0; 1; 10], our_assignment: None, our_approval_sig: None, backing_group: GroupIndex(0), @@ -573,7 +573,7 @@ mod tests { candidate: dummy_candidate_receipt(dummy_hash()), session: 0, block_assignments: BTreeMap::default(), - approvals: bitvec![BitOrderLsb0, u8; 0; 10], + approvals: bitvec![u8, BitOrderLsb0; 0; 10], } .into(); @@ -596,7 +596,7 @@ mod tests { assignments: (6..10).map(|i| (ValidatorIndex(i), 0.into())).collect(), }, ], - assignments: bitvec![BitOrderLsb0, u8; 1; 10], + assignments: bitvec![u8, BitOrderLsb0; 1; 10], our_assignment: None, our_approval_sig: None, backing_group: GroupIndex(0), @@ -649,7 +649,7 @@ mod tests { let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry { tranches: Vec::new(), - assignments: bitvec![BitOrderLsb0, u8; 0; 5], + assignments: bitvec![u8, BitOrderLsb0; 0; 5], our_assignment: None, our_approval_sig: None, backing_group: GroupIndex(0), @@ -665,7 +665,7 @@ mod tests { approval_entry.import_assignment(2, ValidatorIndex(4), block_tick + 2); - let approvals = bitvec![BitOrderLsb0, u8; 1; 5]; + let approvals = bitvec![u8, BitOrderLsb0; 1; 5]; assert_eq!( tranches_to_approve( @@ -693,7 +693,7 @@ mod tests { let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry { tranches: Vec::new(), - assignments: bitvec![BitOrderLsb0, u8; 0; 10], + assignments: bitvec![u8, BitOrderLsb0; 0; 10], our_assignment: None, our_approval_sig: None, backing_group: GroupIndex(0), @@ -704,7 +704,7 @@ mod tests { approval_entry.import_assignment(0, ValidatorIndex(0), block_tick); approval_entry.import_assignment(1, ValidatorIndex(2), block_tick); - let approvals = bitvec![BitOrderLsb0, u8; 0; 10]; + let approvals = bitvec![u8, BitOrderLsb0; 0; 10]; let tranche_now = 2; assert_eq!( @@ -733,7 +733,7 @@ mod tests { let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry { tranches: Vec::new(), - assignments: bitvec![BitOrderLsb0, u8; 0; 10], + assignments: bitvec![u8, BitOrderLsb0; 0; 10], our_assignment: None, our_approval_sig: None, backing_group: GroupIndex(0), @@ -746,7 +746,7 @@ mod tests { approval_entry.import_assignment(1, ValidatorIndex(2), block_tick); - let mut approvals = bitvec![BitOrderLsb0, u8; 0; 10]; + let mut approvals = bitvec![u8, BitOrderLsb0; 0; 10]; approvals.set(0, true); approvals.set(1, true); @@ -778,7 +778,7 @@ mod tests { let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry { tranches: Vec::new(), - assignments: bitvec![BitOrderLsb0, u8; 0; n_validators], + assignments: bitvec![u8, BitOrderLsb0; 0; n_validators], our_assignment: None, our_approval_sig: None, backing_group: GroupIndex(0), @@ -792,7 +792,7 @@ mod tests { approval_entry.import_assignment(1, ValidatorIndex(2), block_tick); approval_entry.import_assignment(1, ValidatorIndex(3), block_tick); - let mut approvals = bitvec![BitOrderLsb0, u8; 0; n_validators]; + let mut approvals = bitvec![u8, BitOrderLsb0; 0; n_validators]; approvals.set(0, true); approvals.set(1, true); // skip 2 @@ -845,7 +845,7 @@ mod tests { let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry { tranches: Vec::new(), - assignments: bitvec![BitOrderLsb0, u8; 0; n_validators], + assignments: bitvec![u8, BitOrderLsb0; 0; n_validators], our_assignment: None, our_approval_sig: None, backing_group: GroupIndex(0), @@ -862,7 +862,7 @@ mod tests { approval_entry.import_assignment(2, ValidatorIndex(4), block_tick + no_show_duration + 2); approval_entry.import_assignment(2, ValidatorIndex(5), block_tick + no_show_duration + 2); - let mut approvals = bitvec![BitOrderLsb0, u8; 0; n_validators]; + let mut approvals = bitvec![u8, BitOrderLsb0; 0; n_validators]; approvals.set(0, true); approvals.set(1, true); // skip 2 @@ -936,7 +936,7 @@ mod tests { let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry { tranches: Vec::new(), - assignments: bitvec![BitOrderLsb0, u8; 0; n_validators], + assignments: bitvec![u8, BitOrderLsb0; 0; n_validators], our_assignment: None, our_approval_sig: None, backing_group: GroupIndex(0), @@ -953,7 +953,7 @@ mod tests { approval_entry.import_assignment(2, ValidatorIndex(4), block_tick + no_show_duration + 2); approval_entry.import_assignment(2, ValidatorIndex(5), block_tick + no_show_duration + 2); - let mut approvals = bitvec![BitOrderLsb0, u8; 0; n_validators]; + let mut approvals = bitvec![u8, BitOrderLsb0; 0; n_validators]; approvals.set(0, true); approvals.set(1, true); // skip 2 @@ -1033,7 +1033,7 @@ mod tests { candidate: dummy_candidate_receipt(dummy_hash()), session: 0, block_assignments: BTreeMap::default(), - approvals: bitvec![BitOrderLsb0, u8; 0; 3], + approvals: bitvec![u8, BitOrderLsb0; 0; 3], } .into(); @@ -1049,7 +1049,7 @@ mod tests { assignments: (2..5).map(|i| (ValidatorIndex(i), 1.into())).collect(), }, ], - assignments: bitvec![BitOrderLsb0, u8; 1; 3], + assignments: bitvec![u8, BitOrderLsb0; 1; 3], our_assignment: None, our_approval_sig: None, backing_group: GroupIndex(0), @@ -1057,7 +1057,7 @@ mod tests { } .into(); - let approvals = bitvec![BitOrderLsb0, u8; 0; 3]; + let approvals = bitvec![u8, BitOrderLsb0; 0; 3]; let tranche_now = 10; assert_eq!( @@ -1099,7 +1099,7 @@ mod tests { backing_group: GroupIndex(0), our_assignment: None, our_approval_sig: None, - assignments: bitvec![BitOrderLsb0, u8; 0; 3], + assignments: bitvec![u8, BitOrderLsb0; 0; 3], approved: false, } .into(); @@ -1137,7 +1137,7 @@ mod tests { let n_validators = 4; let block_tick = 20; - let mut approvals = bitvec![BitOrderLsb0, u8; 0; n_validators]; + let mut approvals = bitvec![u8, BitOrderLsb0; 0; n_validators]; for &v_index in &test.approvals { approvals.set(v_index, true); } diff --git a/node/core/approval-voting/src/approval_db/v1/mod.rs b/node/core/approval-voting/src/approval_db/v1/mod.rs index bcc01717d885..82b98d4c9029 100644 --- a/node/core/approval-voting/src/approval_db/v1/mod.rs +++ b/node/core/approval-voting/src/approval_db/v1/mod.rs @@ -140,7 +140,7 @@ pub struct StoredBlockRange(pub BlockNumber, pub BlockNumber); pub struct Tick(u64); /// Convenience type definition -pub type Bitfield = BitVec; +pub type Bitfield = BitVec; /// The database config. #[derive(Debug, Clone, Copy)] diff --git a/node/core/approval-voting/src/approval_db/v1/tests.rs b/node/core/approval-voting/src/approval_db/v1/tests.rs index e3cb17001a81..bbf6f3a639eb 100644 --- a/node/core/approval-voting/src/approval_db/v1/tests.rs +++ b/node/core/approval-voting/src/approval_db/v1/tests.rs @@ -37,8 +37,8 @@ fn make_db() -> (DbBackend, Arc) { (DbBackend::new(db_writer.clone(), TEST_CONFIG), db_writer) } -fn make_bitvec(len: usize) -> BitVec { - bitvec::bitvec![BitOrderLsb0, u8; 0; len] +fn make_bitvec(len: usize) -> BitVec { + bitvec::bitvec![u8, BitOrderLsb0; 0; len] } fn make_block_entry( diff --git a/node/core/approval-voting/src/import.rs b/node/core/approval-voting/src/import.rs index 1d382096f785..99b8c7024c6b 100644 --- a/node/core/approval-voting/src/import.rs +++ b/node/core/approval-voting/src/import.rs @@ -463,9 +463,9 @@ pub(crate) async fn handle_new_head( block_hash = ?block_hash, "Insta-approving all candidates", ); - bitvec::bitvec![BitOrderLsb0, u8; 1; num_candidates] + bitvec::bitvec![u8, BitOrderLsb0; 1; num_candidates] } else { - let mut result = bitvec::bitvec![BitOrderLsb0, u8; 0; num_candidates]; + let mut result = bitvec::bitvec![u8, BitOrderLsb0; 0; num_candidates]; for (i, &(_, _, _, backing_group)) in included_candidates.iter().enumerate() { let backing_group_size = validator_group_lens.get(backing_group.0 as usize).copied().unwrap_or(0); diff --git a/node/core/approval-voting/src/lib.rs b/node/core/approval-voting/src/lib.rs index 688c7185a464..c5c681e8eff4 100644 --- a/node/core/approval-voting/src/lib.rs +++ b/node/core/approval-voting/src/lib.rs @@ -1257,7 +1257,7 @@ async fn handle_approved_ancestor( let mut block_descriptions = Vec::new(); - let mut bits: BitVec = Default::default(); + let mut bits: BitVec = Default::default(); for (i, block_hash) in std::iter::once(target).chain(ancestry).enumerate() { // Block entries should be present as the assumption is that // nothing here is finalized. If we encounter any missing block @@ -1344,7 +1344,7 @@ async fn handle_approved_ancestor( let n_approvals = c_entry .approvals() .iter() - .by_val() + .by_vals() .enumerate() .filter(|(i, approved)| { *approved && a_entry.is_assigned(ValidatorIndex(*i as _)) diff --git a/node/core/approval-voting/src/ops.rs b/node/core/approval-voting/src/ops.rs index f142ac6b49c5..ad81a2638d5b 100644 --- a/node/core/approval-voting/src/ops.rs +++ b/node/core/approval-voting/src/ops.rs @@ -242,7 +242,7 @@ pub fn add_block_entry( candidate, session, block_assignments: BTreeMap::new(), - approvals: bitvec::bitvec![BitOrderLsb0, u8; 0; n_validators], + approvals: bitvec::bitvec![u8, BitOrderLsb0; 0; n_validators], } }); @@ -253,7 +253,7 @@ pub fn add_block_entry( backing_group, our_assignment.map(|v| v.into()), None, - bitvec::bitvec![BitOrderLsb0, u8; 0; n_validators], + bitvec::bitvec![u8, BitOrderLsb0; 0; n_validators], false, ), ); diff --git a/node/core/approval-voting/src/persisted_entries.rs b/node/core/approval-voting/src/persisted_entries.rs index f5be1a5d8852..ce56bf1a06bb 100644 --- a/node/core/approval-voting/src/persisted_entries.rs +++ b/node/core/approval-voting/src/persisted_entries.rs @@ -80,7 +80,7 @@ pub struct ApprovalEntry { our_assignment: Option, our_approval_sig: Option, // `n_validators` bits. - assignments: BitVec, + assignments: BitVec, approved: bool, } @@ -92,7 +92,7 @@ impl ApprovalEntry { our_assignment: Option, our_approval_sig: Option, // `n_validators` bits. - assignments: BitVec, + assignments: BitVec, approved: bool, ) -> Self { Self { tranches, backing_group, our_assignment, our_approval_sig, assignments, approved } @@ -163,9 +163,9 @@ impl ApprovalEntry { // Produce a bitvec indicating the assignments of all validators up to and // including `tranche`. - pub fn assignments_up_to(&self, tranche: DelayTranche) -> BitVec { + pub fn assignments_up_to(&self, tranche: DelayTranche) -> BitVec { self.tranches.iter().take_while(|e| e.tranche <= tranche).fold( - bitvec::bitvec![BitOrderLsb0, u8; 0; self.assignments.len()], + bitvec::bitvec![u8, BitOrderLsb0; 0; self.assignments.len()], |mut a, e| { for &(v, _) in &e.assignments { a.set(v.0 as _, true); @@ -253,12 +253,12 @@ pub struct CandidateEntry { // Assignments are based on blocks, so we need to track assignments separately // based on the block we are looking at. pub block_assignments: BTreeMap, - pub approvals: BitVec, + pub approvals: BitVec, } impl CandidateEntry { /// Access the bit-vec of approvals. - pub fn approvals(&self) -> &BitSlice { + pub fn approvals(&self) -> &BitSlice { &self.approvals } @@ -336,7 +336,7 @@ pub struct BlockEntry { // A bitfield where the i'th bit corresponds to the i'th candidate in `candidates`. // The i'th bit is `true` iff the candidate has been approved in the context of this // block. The block can be considered approved if the bitfield has all bits set to `true`. - pub approved_bitfield: BitVec, + pub approved_bitfield: BitVec, pub children: Vec, } diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml index 8e5a48f3066a..ddfbf168f252 100644 --- a/node/core/av-store/Cargo.toml +++ b/node/core/av-store/Cargo.toml @@ -10,7 +10,7 @@ futures-timer = "3.0.2" kvdb = "0.11.0" thiserror = "1.0.30" tracing = "0.1.31" -bitvec = "0.20.1" +bitvec = "1.0.0" parity-scale-codec = { version = "3.0.0", features = ["derive"] } erasure = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" } diff --git a/node/core/av-store/src/lib.rs b/node/core/av-store/src/lib.rs index 74f14a9ceb5f..7b5a736447f0 100644 --- a/node/core/av-store/src/lib.rs +++ b/node/core/av-store/src/lib.rs @@ -148,7 +148,7 @@ enum State { struct CandidateMeta { state: State, data_available: bool, - chunks_stored: BitVec, + chunks_stored: BitVec, } fn query_inner( @@ -727,7 +727,7 @@ fn note_block_backed( let meta = CandidateMeta { state: State::Unavailable(now.into()), data_available: false, - chunks_stored: bitvec::bitvec![BitOrderLsb0, u8; 0; n_validators], + chunks_stored: bitvec::bitvec![u8, BitOrderLsb0; 0; n_validators], }; let prune_at = now + pruning_config.keep_unavailable_for; @@ -1210,7 +1210,7 @@ fn store_available_data( } meta.data_available = true; - meta.chunks_stored = bitvec::bitvec![BitOrderLsb0, u8; 1; n_validators]; + meta.chunks_stored = bitvec::bitvec![u8, BitOrderLsb0; 1; n_validators]; write_meta(&mut tx, &subsystem.config, &candidate_hash, &meta); write_available_data(&mut tx, &subsystem.config, &candidate_hash, &available_data); diff --git a/node/core/av-store/src/tests.rs b/node/core/av-store/src/tests.rs index da34fca5fa5f..3a7d45888982 100644 --- a/node/core/av-store/src/tests.rs +++ b/node/core/av-store/src/tests.rs @@ -291,7 +291,7 @@ fn store_chunk_works() { &candidate_hash, &CandidateMeta { data_available: false, - chunks_stored: bitvec::bitvec![BitOrderLsb0, u8; 0; n_validators], + chunks_stored: bitvec::bitvec![u8, BitOrderLsb0; 0; n_validators], state: State::Unavailable(BETimestamp(0)), }, ); @@ -364,7 +364,7 @@ fn query_chunk_checks_meta() { &CandidateMeta { data_available: false, chunks_stored: { - let mut v = bitvec::bitvec![BitOrderLsb0, u8; 0; n_validators]; + let mut v = bitvec::bitvec![u8, BitOrderLsb0; 0; n_validators]; v.set(validator_index.0 as usize, true); v }, @@ -528,7 +528,7 @@ fn query_all_chunks_works() { &candidate_hash_2, &CandidateMeta { data_available: false, - chunks_stored: bitvec::bitvec![BitOrderLsb0, u8; 0; n_validators as _], + chunks_stored: bitvec::bitvec![u8, BitOrderLsb0; 0; n_validators as _], state: State::Unavailable(BETimestamp(0)), }, ); diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml index 0bc7ff04c1c3..ac73eaa07cd5 100644 --- a/node/core/backing/Cargo.toml +++ b/node/core/backing/Cargo.toml @@ -13,7 +13,7 @@ polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsys polkadot-node-subsystem-util = { path = "../../subsystem-util" } erasure-coding = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" } statement-table = { package = "polkadot-statement-table", path = "../../../statement-table" } -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } tracing = "0.1.31" thiserror = "1.0.30" diff --git a/node/core/backing/src/tests.rs b/node/core/backing/src/tests.rs index c72386171a97..68602189dcd7 100644 --- a/node/core/backing/src/tests.rs +++ b/node/core/backing/src/tests.rs @@ -752,7 +752,7 @@ fn backing_works_while_validation_ongoing() { .contains(&ValidityAttestation::Explicit(signed_c.signature().clone()))); assert_eq!( candidates[0].validator_indices, - bitvec::bitvec![bitvec::order::Lsb0, u8; 1, 0, 1, 1], + bitvec::bitvec![u8, bitvec::order::Lsb0; 1, 0, 1, 1], ); virtual_overseer @@ -1484,7 +1484,7 @@ fn candidate_backing_reorders_votes() { let backed = table_attested_to_backed(attested, &table_context).unwrap(); let expected_bitvec = { - let mut validator_indices = BitVec::::with_capacity(6); + let mut validator_indices = BitVec::::with_capacity(6); validator_indices.resize(6, false); validator_indices.set(1, true); diff --git a/node/core/provisioner/Cargo.toml b/node/core/provisioner/Cargo.toml index 1fbe9f83bef8..146a7ebdd831 100644 --- a/node/core/provisioner/Cargo.toml +++ b/node/core/provisioner/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } futures = "0.3.21" tracing = "0.1.31" thiserror = "1.0.30" diff --git a/node/core/provisioner/src/lib.rs b/node/core/provisioner/src/lib.rs index 8789098693fe..d761844007d8 100644 --- a/node/core/provisioner/src/lib.rs +++ b/node/core/provisioner/src/lib.rs @@ -291,7 +291,7 @@ impl ProvisionerJob { } } -type CoreAvailability = BitVec; +type CoreAvailability = BitVec; /// The provisioner is the subsystem best suited to choosing which specific /// backed candidates and availability bitfields should be assembled into the diff --git a/node/core/provisioner/src/tests.rs b/node/core/provisioner/src/tests.rs index 9e0af0c3a79b..d4552743252c 100644 --- a/node/core/provisioner/src/tests.rs +++ b/node/core/provisioner/src/tests.rs @@ -10,7 +10,7 @@ pub fn occupied_core(para_id: u32) -> CoreState { occupied_since: 100_u32, time_out_at: 200_u32, next_up_on_time_out: None, - availability: bitvec![bitvec::order::Lsb0, u8; 0; 32], + availability: bitvec![u8, bitvec::order::Lsb0; 0; 32], candidate_descriptor: dummy_candidate_descriptor(dummy_hash()), candidate_hash: Default::default(), }) @@ -31,7 +31,7 @@ where } pub fn default_bitvec(n_cores: usize) -> CoreAvailability { - bitvec![bitvec::order::Lsb0, u8; 0; n_cores] + bitvec![u8, bitvec::order::Lsb0; 0; n_cores] } pub fn scheduled_core(id: u32) -> ScheduledCore { diff --git a/node/network/bitfield-distribution/Cargo.toml b/node/network/bitfield-distribution/Cargo.toml index 346a26353cb1..56268cc4492a 100644 --- a/node/network/bitfield-distribution/Cargo.toml +++ b/node/network/bitfield-distribution/Cargo.toml @@ -14,7 +14,7 @@ polkadot-node-network-protocol = { path = "../../network/protocol" } [dev-dependencies] polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/network/bitfield-distribution/src/tests.rs b/node/network/bitfield-distribution/src/tests.rs index 94b200a4a853..049b04ca6a0f 100644 --- a/node/network/bitfield-distribution/src/tests.rs +++ b/node/network/bitfield-distribution/src/tests.rs @@ -124,7 +124,7 @@ fn receive_invalid_signature() { let validator_1 = SyncCryptoStore::sr25519_generate_new(&*keystore, ValidatorId::ID, None) .expect("key created"); - let payload = AvailabilityBitfield(bitvec![bitvec::order::Lsb0, u8; 1u8; 32]); + let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]); let invalid_signed = executor::block_on(Signed::::sign( &keystore, payload.clone(), @@ -236,7 +236,7 @@ fn receive_invalid_validator_index() { state.peer_views.insert(peer_b.clone(), view![hash_a]); - let payload = AvailabilityBitfield(bitvec![bitvec::order::Lsb0, u8; 1u8; 32]); + let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]); let signed = executor::block_on(Signed::::sign( &keystore, payload, @@ -294,7 +294,7 @@ fn receive_duplicate_messages() { state_with_view(our_view![hash_a, hash_b], hash_a.clone()); // create a signed message by validator 0 - let payload = AvailabilityBitfield(bitvec![bitvec::order::Lsb0, u8; 1u8; 32]); + let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]); let signed_bitfield = executor::block_on(Signed::::sign( &keystore, payload, @@ -403,7 +403,7 @@ fn do_not_relay_message_twice() { state_with_view(our_view![hash], hash.clone()); // create a signed message by validator 0 - let payload = AvailabilityBitfield(bitvec![bitvec::order::Lsb0, u8; 1u8; 32]); + let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]); let signed_bitfield = executor::block_on(Signed::::sign( &keystore, payload, @@ -507,7 +507,7 @@ fn changing_view() { state_with_view(our_view![hash_a, hash_b], hash_a.clone()); // create a signed message by validator 0 - let payload = AvailabilityBitfield(bitvec![bitvec::order::Lsb0, u8; 1u8; 32]); + let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]); let signed_bitfield = executor::block_on(Signed::::sign( &keystore, payload, @@ -655,7 +655,7 @@ fn do_not_send_message_back_to_origin() { let (mut state, signing_context, keystore, validator) = state_with_view(our_view![hash], hash); // create a signed message by validator 0 - let payload = AvailabilityBitfield(bitvec![bitvec::order::Lsb0, u8; 1u8; 32]); + let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]); let signed_bitfield = executor::block_on(Signed::::sign( &keystore, payload, diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 59420cd387de..524d39f4a172 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -24,7 +24,7 @@ runtime_primitives = { package = "sp-runtime", git = "https://github.com/parityt polkadot-parachain = { path = "../parachain", default-features = false } polkadot-core-primitives = { path = "../core-primitives", default-features = false } trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } hex-literal = "0.3.4" parity-util-mem = { version = "0.11.0", default-features = false, optional = true } diff --git a/primitives/src/v0.rs b/primitives/src/v0.rs index 76f9230aaa12..c4751babd35b 100644 --- a/primitives/src/v0.rs +++ b/primitives/src/v0.rs @@ -797,7 +797,7 @@ pub struct AttestedCandidate { /// Validity attestations. pub validity_votes: Vec, /// Indices of the corresponding validity votes. - pub validator_indices: BitVec, + pub validator_indices: BitVec, } impl AttestedCandidate { diff --git a/primitives/src/v1/mod.rs b/primitives/src/v1/mod.rs index 9e06a82fa4c8..e6281c20decf 100644 --- a/primitives/src/v1/mod.rs +++ b/primitives/src/v1/mod.rs @@ -545,10 +545,10 @@ impl CandidateCommitments { /// /// Every bit refers to an availability core index. #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)] -pub struct AvailabilityBitfield(pub BitVec); +pub struct AvailabilityBitfield(pub BitVec); -impl From> for AvailabilityBitfield { - fn from(inner: BitVec) -> Self { +impl From> for AvailabilityBitfield { + fn from(inner: BitVec) -> Self { AvailabilityBitfield(inner) } } @@ -574,7 +574,7 @@ pub struct BackedCandidate { /// The validity votes themselves, expressed as signatures. pub validity_votes: Vec, /// The indices of the validators within the group, expressed as a bitfield. - pub validator_indices: BitVec, + pub validator_indices: BitVec, } impl BackedCandidate { @@ -810,7 +810,7 @@ pub struct OccupiedCore { /// validators has attested to availability on-chain. A 2/3+ majority of `1` bits means that /// this will be available. #[cfg_attr(feature = "std", ignore_malloc_size_of = "outside type")] - pub availability: BitVec, + pub availability: BitVec, /// The group assigned to distribute availability pieces of this candidate. pub group_responsible: GroupIndex, /// The hash of the candidate occupying the core. @@ -1331,9 +1331,9 @@ pub type CheckedMultiDisputeStatementSet = Vec; #[derive(Encode, Decode, Clone, RuntimeDebug, PartialEq, TypeInfo)] pub struct DisputeState { /// A bitfield indicating all validators for the candidate. - pub validators_for: BitVec, // one bit per validator. + pub validators_for: BitVec, // one bit per validator. /// A bitfield indicating all validators against the candidate. - pub validators_against: BitVec, // one bit per validator. + pub validators_against: BitVec, // one bit per validator. /// The block number at which the dispute started on-chain. pub start: N, /// The block number at which the dispute concluded on-chain. diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 46a9b38dd2b8..16caa36a3abf 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] impl-trait-for-tuples = "0.2.2" -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.13", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 00a6c7426d50..dce936695f85 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" build = "build.rs" [dependencies] -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index 6d5804f0ac45..3b2536a3dfad 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } diff --git a/runtime/parachains/src/builder.rs b/runtime/parachains/src/builder.rs index e1a1e88cf29f..2cfd27ec9461 100644 --- a/runtime/parachains/src/builder.rs +++ b/runtime/parachains/src/builder.rs @@ -257,7 +257,7 @@ impl BenchBuilder { group_idx: GroupIndex, core_idx: CoreIndex, candidate_hash: CandidateHash, - availability_votes: BitVec, + availability_votes: BitVec, ) -> inclusion::CandidatePendingAvailability { inclusion::CandidatePendingAvailability::::new( core_idx, // core @@ -280,7 +280,7 @@ impl BenchBuilder { para_id: ParaId, core_idx: CoreIndex, group_idx: GroupIndex, - availability_votes: BitVec, + availability_votes: BitVec, candidate_hash: CandidateHash, ) { let candidate_availability = Self::candidate_availability_mock( @@ -304,7 +304,7 @@ impl BenchBuilder { /// Create an `AvailabilityBitfield` where `concluding` is a map where each key is a core index /// that is concluding and `cores` is the total number of cores in the system. fn availability_bitvec(concluding: &BTreeMap, cores: u32) -> AvailabilityBitfield { - let mut bitfields = bitvec::bitvec![bitvec::order::Lsb0, u8; 0; 0]; + let mut bitfields = bitvec::bitvec![u8, bitvec::order::Lsb0; 0; 0]; for i in 0..cores { if concluding.get(&(i as u32)).is_some() { bitfields.push(true); @@ -373,9 +373,9 @@ impl BenchBuilder { } /// Create a bitvec of `validators` length with all yes votes. - fn validator_availability_votes_yes(validators: usize) -> BitVec { + fn validator_availability_votes_yes(validators: usize) -> BitVec { // every validator confirms availability. - bitvec::bitvec![bitvec::order::Lsb0, u8; 1; validators as usize] + bitvec::bitvec![u8, bitvec::order::Lsb0; 1; validators as usize] } /// Setup session 1 and create `self.validators_map` and `self.validators`. @@ -565,7 +565,7 @@ impl BenchBuilder { BackedCandidate:: { candidate, validity_votes, - validator_indices: bitvec::bitvec![bitvec::order::Lsb0, u8; 1; group_validators.len()], + validator_indices: bitvec::bitvec![u8, bitvec::order::Lsb0; 1; group_validators.len()], } }) .collect() diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs index b723d4a4ab13..557622c89b8e 100644 --- a/runtime/parachains/src/disputes.rs +++ b/runtime/parachains/src/disputes.rs @@ -530,11 +530,7 @@ impl DisputeStateFlags { let supermajority_threshold = supermajority_threshold(n); let mut flags = DisputeStateFlags::default(); - let all_participants = { - let mut a = state.validators_for.clone(); - *a |= state.validators_against.iter().by_val(); - a - }; + let all_participants = state.validators_for.clone() | state.validators_against.clone(); if all_participants.count_ones() > byzantine_threshold { flags |= DisputeStateFlags::CONFIRMED; } @@ -567,7 +563,7 @@ struct ImportSummary { // Validators to slash for being (wrongly) on the FOR side. slash_for: Vec, // New participants in the dispute. - new_participants: bitvec::vec::BitVec, + new_participants: bitvec::vec::BitVec, // Difference in state flags from previous. new_flags: DisputeStateFlags, } @@ -597,14 +593,14 @@ struct ImportUndo { struct DisputeStateImporter { state: DisputeState, now: BlockNumber, - new_participants: bitvec::vec::BitVec, + new_participants: bitvec::vec::BitVec, pre_flags: DisputeStateFlags, } impl DisputeStateImporter { fn new(state: DisputeState, now: BlockNumber) -> Self { let pre_flags = DisputeStateFlags::from_state(&state); - let new_participants = bitvec::bitvec![BitOrderLsb0, u8; 0; state.validators_for.len()]; + let new_participants = bitvec::bitvec![u8, BitOrderLsb0; 0; state.validators_for.len()]; DisputeStateImporter { state, now, new_participants, pre_flags } } @@ -676,14 +672,8 @@ impl DisputeStateImporter { }, (false, true) => { let prev_participants = { - // all participants - let mut a = self.state.validators_for.clone(); - *a |= self.state.validators_against.iter().by_val(); - - // which are not new participants - *a &= self.new_participants.iter().by_val().map(|b| !b); - - a + // all participants, which are not new participants + (self.state.validators_for.clone() | self.state.validators_against.clone()) & !self.new_participants.clone(); }; prev_participants @@ -942,8 +932,8 @@ impl Pallet { dispute_state } else { DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 0; n_validators], - validators_against: bitvec![BitOrderLsb0, u8; 0; n_validators], + validators_for: bitvec![u8, BitOrderLsb0; 0; n_validators], + validators_against: bitvec![u8, BitOrderLsb0; 0; n_validators], start: now, concluded_at: None, } @@ -1106,8 +1096,8 @@ impl Pallet { ( true, DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 0; n_validators], - validators_against: bitvec![BitOrderLsb0, u8; 0; n_validators], + validators_for: bitvec![u8, BitOrderLsb0; 0; n_validators], + validators_against: bitvec![u8, BitOrderLsb0; 0; n_validators], start: now, concluded_at: None, }, @@ -1271,10 +1261,10 @@ fn has_supermajority_against(dispute: &DisputeState) - fn decrement_spam( spam_slots: &mut [u32], dispute: &DisputeState, -) -> bitvec::vec::BitVec { +) -> bitvec::vec::BitVec { let byzantine_threshold = byzantine_threshold(spam_slots.len()); - let participating = dispute.validators_for.clone() | dispute.validators_against.iter().by_val(); + let participating = dispute.validators_for.clone() | dispute.validators_against.clone(); let decrement_spam = participating.count_ones() <= byzantine_threshold; for validator_index in participating.iter_ones() { if decrement_spam { diff --git a/runtime/parachains/src/disputes/tests.rs b/runtime/parachains/src/disputes/tests.rs index 5a00cfa8f4bc..d05cda5758c2 100644 --- a/runtime/parachains/src/disputes/tests.rs +++ b/runtime/parachains/src/disputes/tests.rs @@ -105,8 +105,8 @@ fn test_contains_duplicates_in_sorted_iter() { fn test_dispute_state_flag_from_state() { assert_eq!( DisputeStateFlags::from_state(&DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 0, 0, 0, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 0, 0, 0, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 0, 0, 0, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 0, 0, 0, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }), @@ -115,8 +115,8 @@ fn test_dispute_state_flag_from_state() { assert_eq!( DisputeStateFlags::from_state(&DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 1, 1, 1, 1, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 0, 0, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 1, 1, 1, 1, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 0, 0, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }), @@ -125,8 +125,8 @@ fn test_dispute_state_flag_from_state() { assert_eq!( DisputeStateFlags::from_state(&DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 0, 0, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 1, 1, 1, 1, 1, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 0, 0, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 1, 1, 1, 1, 1, 0, 0], start: 0, concluded_at: None, }), @@ -138,8 +138,8 @@ fn test_dispute_state_flag_from_state() { fn test_import_new_participant_spam_inc() { let mut importer = DisputeStateImporter::new( DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 0, 0, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 0, 0, 0, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 0, 0, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 0, 0, 0, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }, @@ -165,8 +165,8 @@ fn test_import_new_participant_spam_inc() { assert_eq!( summary.state, DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 0, 1, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 1, 0, 1, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 0, 1, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 1, 0, 1, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }, @@ -174,15 +174,15 @@ fn test_import_new_participant_spam_inc() { assert_eq!(summary.spam_slot_changes, vec![(ValidatorIndex(2), SpamSlotChange::Inc)]); assert!(summary.slash_for.is_empty()); assert!(summary.slash_against.is_empty()); - assert_eq!(summary.new_participants, bitvec![BitOrderLsb0, u8; 0, 0, 1, 0, 0, 0, 0, 0]); + assert_eq!(summary.new_participants, bitvec![u8, BitOrderLsb0; 0, 0, 1, 0, 0, 0, 0, 0]); } #[test] fn test_import_prev_participant_spam_dec_confirmed() { let mut importer = DisputeStateImporter::new( DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 0, 0, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 0, 1, 0, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 0, 0, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 0, 1, 0, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }, @@ -195,8 +195,8 @@ fn test_import_prev_participant_spam_dec_confirmed() { assert_eq!( summary.state, DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 0, 1, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 0, 1, 0, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 0, 1, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 0, 1, 0, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }, @@ -207,7 +207,7 @@ fn test_import_prev_participant_spam_dec_confirmed() { ); assert!(summary.slash_for.is_empty()); assert!(summary.slash_against.is_empty()); - assert_eq!(summary.new_participants, bitvec![BitOrderLsb0, u8; 0, 0, 1, 0, 0, 0, 0, 0]); + assert_eq!(summary.new_participants, bitvec![u8, BitOrderLsb0; 0, 0, 1, 0, 0, 0, 0, 0]); assert_eq!(summary.new_flags, DisputeStateFlags::CONFIRMED); } @@ -215,8 +215,8 @@ fn test_import_prev_participant_spam_dec_confirmed() { fn test_import_prev_participant_spam_dec_confirmed_slash_for() { let mut importer = DisputeStateImporter::new( DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 0, 0, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 0, 1, 0, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 0, 0, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 0, 1, 0, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }, @@ -234,8 +234,8 @@ fn test_import_prev_participant_spam_dec_confirmed_slash_for() { assert_eq!( summary.state, DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 0, 1, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 0, 1, 1, 1, 1, 1, 1, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 0, 1, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 0, 1, 1, 1, 1, 1, 1, 0], start: 0, concluded_at: Some(0), }, @@ -246,7 +246,7 @@ fn test_import_prev_participant_spam_dec_confirmed_slash_for() { ); assert_eq!(summary.slash_for, vec![ValidatorIndex(0), ValidatorIndex(2)]); assert!(summary.slash_against.is_empty()); - assert_eq!(summary.new_participants, bitvec![BitOrderLsb0, u8; 0, 0, 1, 1, 1, 1, 1, 0]); + assert_eq!(summary.new_participants, bitvec![u8, BitOrderLsb0; 0, 0, 1, 1, 1, 1, 1, 0]); assert_eq!( summary.new_flags, DisputeStateFlags::CONFIRMED | DisputeStateFlags::AGAINST_SUPERMAJORITY, @@ -257,8 +257,8 @@ fn test_import_prev_participant_spam_dec_confirmed_slash_for() { fn test_import_slash_against() { let mut importer = DisputeStateImporter::new( DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 0, 1, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 0, 1, 0, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 0, 1, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 0, 1, 0, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }, @@ -275,8 +275,8 @@ fn test_import_slash_against() { assert_eq!( summary.state, DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 0, 1, 1, 1, 0, 1, 1], - validators_against: bitvec![BitOrderLsb0, u8; 0, 1, 0, 0, 0, 1, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 0, 1, 1, 1, 0, 1, 1], + validators_against: bitvec![u8, BitOrderLsb0; 0, 1, 0, 0, 0, 1, 0, 0], start: 0, concluded_at: Some(0), }, @@ -284,7 +284,7 @@ fn test_import_slash_against() { assert!(summary.spam_slot_changes.is_empty()); assert!(summary.slash_for.is_empty()); assert_eq!(summary.slash_against, vec![ValidatorIndex(1), ValidatorIndex(5)]); - assert_eq!(summary.new_participants, bitvec![BitOrderLsb0, u8; 0, 0, 0, 1, 1, 1, 1, 1]); + assert_eq!(summary.new_participants, bitvec![u8, BitOrderLsb0; 0, 0, 0, 1, 1, 1, 1, 1]); assert_eq!(summary.new_flags, DisputeStateFlags::FOR_SUPERMAJORITY); } @@ -1021,8 +1021,8 @@ fn test_provide_multi_dispute_success_and_other() { 5, candidate_hash.clone(), DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 0, 0, 0, 0, 0, 1, 0], - validators_against: bitvec![BitOrderLsb0, u8; 1, 1, 1, 0, 1, 0, 1], + validators_for: bitvec![u8, BitOrderLsb0; 0, 0, 0, 0, 0, 1, 0], + validators_against: bitvec![u8, BitOrderLsb0; 1, 1, 1, 0, 1, 0, 1], start: 6, concluded_at: Some(6), // 5 vote against } @@ -1031,8 +1031,8 @@ fn test_provide_multi_dispute_success_and_other() { 3, candidate_hash.clone(), DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 1, 0, 1, 1, 0, 1], - validators_against: bitvec![BitOrderLsb0, u8; 0, 0, 1, 0, 0, 1, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 1, 0, 1, 1, 0, 1], + validators_against: bitvec![u8, BitOrderLsb0; 0, 0, 1, 0, 0, 1, 0], start: 6, concluded_at: Some(6), // 5 vote for } @@ -1041,8 +1041,8 @@ fn test_provide_multi_dispute_success_and_other() { 4, candidate_hash.clone(), DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 0, 0, 0, 1, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 0, 0, 1, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 0, 0, 0, 1, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 0, 0, 1, 0, 0, 0, 0], start: 6, concluded_at: None, } @@ -1154,8 +1154,8 @@ fn test_revert_and_freeze_merges() { fn test_has_supermajority_against() { assert_eq!( has_supermajority_against(&DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 1, 0, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 1, 1, 1, 1, 1, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 1, 0, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 1, 1, 1, 1, 1, 0, 0, 0], start: 0, concluded_at: None, }), @@ -1164,8 +1164,8 @@ fn test_has_supermajority_against() { assert_eq!( has_supermajority_against(&DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 1, 0, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 1, 1, 1, 1, 1, 1, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 1, 0, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 1, 1, 1, 1, 1, 1, 0, 0], start: 0, concluded_at: None, }), @@ -1180,23 +1180,23 @@ fn test_decrement_spam() { // Test confirm is no-op let mut spam_slots = original_spam_slots.clone(); let dispute_state_confirm = DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 1, 0, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 1, 0, 1, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 1, 0, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 1, 0, 1, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }; assert_eq!(DisputeStateFlags::from_state(&dispute_state_confirm), DisputeStateFlags::CONFIRMED); assert_eq!( decrement_spam(spam_slots.as_mut(), &dispute_state_confirm), - bitvec![BitOrderLsb0, u8; 1, 1, 1, 0, 0, 0, 0, 0], + bitvec![u8, BitOrderLsb0; 1, 1, 1, 0, 0, 0, 0, 0], ); assert_eq!(spam_slots, original_spam_slots); // Test not confirm is decreasing spam let mut spam_slots = original_spam_slots.clone(); let dispute_state_no_confirm = DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 1, 0, 0, 0, 0, 0, 0, 0], - validators_against: bitvec![BitOrderLsb0, u8; 1, 0, 1, 0, 0, 0, 0, 0], + validators_for: bitvec![u8, BitOrderLsb0; 1, 0, 0, 0, 0, 0, 0, 0], + validators_against: bitvec![u8, BitOrderLsb0; 1, 0, 1, 0, 0, 0, 0, 0], start: 0, concluded_at: None, }; @@ -1206,7 +1206,7 @@ fn test_decrement_spam() { ); assert_eq!( decrement_spam(spam_slots.as_mut(), &dispute_state_no_confirm), - bitvec![BitOrderLsb0, u8; 1, 0, 1, 0, 0, 0, 0, 0], + bitvec![u8, BitOrderLsb0; 1, 0, 1, 0, 0, 0, 0, 0], ); assert_eq!(spam_slots, vec![0, 1, 1, 3, 4, 5, 6, 7]); } @@ -2090,8 +2090,8 @@ fn filter_removes_concluded_ancient() { &1, &candidate_hash_a, DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 0; 4], - validators_against: bitvec![BitOrderLsb0, u8; 1; 4], + validators_for: bitvec![u8, BitOrderLsb0; 0; 4], + validators_against: bitvec![u8, BitOrderLsb0; 1; 4], start: 0, concluded_at: Some(0), }, @@ -2101,8 +2101,8 @@ fn filter_removes_concluded_ancient() { &1, &candidate_hash_b, DisputeState { - validators_for: bitvec![BitOrderLsb0, u8; 0; 4], - validators_against: bitvec![BitOrderLsb0, u8; 1; 4], + validators_for: bitvec![u8, BitOrderLsb0; 0; 4], + validators_against: bitvec![u8, BitOrderLsb0; 1; 4], start: 0, concluded_at: Some(1), }, diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs index 5ec6b807a38d..ecf5b7c94af8 100644 --- a/runtime/parachains/src/inclusion/mod.rs +++ b/runtime/parachains/src/inclusion/mod.rs @@ -78,9 +78,9 @@ pub struct CandidatePendingAvailability { /// The candidate descriptor. descriptor: CandidateDescriptor, /// The received availability votes. One bit per validator. - availability_votes: BitVec, + availability_votes: BitVec, /// The backers of the candidate pending availability. - backers: BitVec, + backers: BitVec, /// The block number of the relay-parent of the receipt. relay_parent_number: N, /// The block number of the relay-chain block this was backed in. @@ -91,7 +91,7 @@ pub struct CandidatePendingAvailability { impl CandidatePendingAvailability { /// Get the availability votes on the candidate. - pub(crate) fn availability_votes(&self) -> &BitVec { + pub(crate) fn availability_votes(&self) -> &BitVec { &self.availability_votes } @@ -120,8 +120,8 @@ impl CandidatePendingAvailability { core: CoreIndex, hash: CandidateHash, descriptor: CandidateDescriptor, - availability_votes: BitVec, - backers: BitVec, + availability_votes: BitVec, + backers: BitVec, relay_parent_number: N, backed_in_number: N, backing_group: GroupIndex, @@ -544,7 +544,7 @@ impl Pallet { } let para_id = backed_candidate.descriptor().para_id; - let mut backers = bitvec::bitvec![BitOrderLsb0, u8; 0; validators.len()]; + let mut backers = bitvec::bitvec![u8, BitOrderLsb0; 0; validators.len()]; for (i, assignment) in scheduled[skip..].iter().enumerate() { check_assignment_in_order(assignment)?; @@ -649,8 +649,8 @@ impl Pallet { let para_id = candidate.descriptor().para_id; // initialize all availability votes to 0. - let availability_votes: BitVec = - bitvec::bitvec![BitOrderLsb0, u8; 0; validators.len()]; + let availability_votes: BitVec = + bitvec::bitvec![u8, BitOrderLsb0; 0; validators.len()]; Self::deposit_event(Event::::CandidateBacked( candidate.candidate.to_plain(), @@ -721,8 +721,8 @@ impl Pallet { fn enact_candidate( relay_parent_number: T::BlockNumber, receipt: CommittedCandidateReceipt, - backers: BitVec, - availability_votes: BitVec, + backers: BitVec, + availability_votes: BitVec, core_index: CoreIndex, backing_group: GroupIndex, ) -> Weight { diff --git a/runtime/parachains/src/inclusion/tests.rs b/runtime/parachains/src/inclusion/tests.rs index d64fadf8aecb..cd6b968ddcd1 100644 --- a/runtime/parachains/src/inclusion/tests.rs +++ b/runtime/parachains/src/inclusion/tests.rs @@ -113,7 +113,7 @@ pub(crate) async fn back_candidate( signing_context: &SigningContext, kind: BackingKind, ) -> BackedCandidate { - let mut validator_indices = bitvec::bitvec![BitOrderLsb0, u8; 0; group.len()]; + let mut validator_indices = bitvec::bitvec![u8, BitOrderLsb0; 0; group.len()]; let threshold = minimum_backing_votes(group.len()); let signing = match kind { @@ -201,18 +201,18 @@ pub(crate) fn expected_bits() -> usize { } fn default_bitfield() -> AvailabilityBitfield { - AvailabilityBitfield(bitvec::bitvec![BitOrderLsb0, u8; 0; expected_bits()]) + AvailabilityBitfield(bitvec::bitvec![u8, BitOrderLsb0; 0; expected_bits()]) } -fn default_availability_votes() -> BitVec { - bitvec::bitvec![BitOrderLsb0, u8; 0; ParasShared::active_validator_keys().len()] +fn default_availability_votes() -> BitVec { + bitvec::bitvec![u8, BitOrderLsb0; 0; ParasShared::active_validator_keys().len()] } -fn default_backing_bitfield() -> BitVec { - bitvec::bitvec![BitOrderLsb0, u8; 0; ParasShared::active_validator_keys().len()] +fn default_backing_bitfield() -> BitVec { + bitvec::bitvec![u8, BitOrderLsb0; 0; ParasShared::active_validator_keys().len()] } -fn backing_bitfield(v: &[usize]) -> BitVec { +fn backing_bitfield(v: &[usize]) -> BitVec { let mut b = default_backing_bitfield(); for i in v { b.set(*i, true); diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs index 75fa5f8e012e..19d26d4319ea 100644 --- a/runtime/parachains/src/paras/mod.rs +++ b/runtime/parachains/src/paras/mod.rs @@ -339,8 +339,8 @@ struct PvfCheckActiveVoteState { // makes a vote. Once a 1 is set for either of the vectors, that validator cannot vote anymore. // Since the active validator set changes each session, the bit vectors are reinitialized as // well: zeroed and resized so that each validator gets its own bit. - votes_accept: BitVec, - votes_reject: BitVec, + votes_accept: BitVec, + votes_reject: BitVec, /// The number of session changes this PVF vote has observed. Therefore, this number is /// increased at each session boundary. When created, it is initialized with 0. @@ -359,8 +359,8 @@ impl PvfCheckActiveVoteState { causes.push(cause); Self { created_at: now, - votes_accept: bitvec::bitvec![BitOrderLsb0, u8; 0; n_validators], - votes_reject: bitvec::bitvec![BitOrderLsb0, u8; 0; n_validators], + votes_accept: bitvec::bitvec![u8, BitOrderLsb0; 0; n_validators], + votes_reject: bitvec::bitvec![u8, BitOrderLsb0; 0; n_validators], age: 0, causes, } diff --git a/runtime/parachains/src/paras_inherent/mod.rs b/runtime/parachains/src/paras_inherent/mod.rs index 92abf8263fbf..bbc8b59803cd 100644 --- a/runtime/parachains/src/paras_inherent/mod.rs +++ b/runtime/parachains/src/paras_inherent/mod.rs @@ -81,10 +81,10 @@ const LOG_TARGET: &str = "runtime::inclusion-inherent"; /// A bitfield concerning concluded disputes for candidates /// associated to the core index equivalent to the bit position. #[derive(Default, PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)] -pub(crate) struct DisputedBitfield(pub(crate) BitVec); +pub(crate) struct DisputedBitfield(pub(crate) BitVec); -impl From> for DisputedBitfield { - fn from(inner: BitVec) -> Self { +impl From> for DisputedBitfield { + fn from(inner: BitVec) -> Self { Self(inner) } } @@ -93,7 +93,7 @@ impl From> for DisputedBitfield { impl DisputedBitfield { /// Create a new bitfield, where each bit is set to `false`. pub fn zeros(n: usize) -> Self { - Self::from(BitVec::::repeat(false, n)) + Self::from(BitVec::::repeat(false, n)) } } @@ -964,7 +964,7 @@ pub(crate) fn sanitize_bitfields( return vec![] } - let all_zeros = BitVec::::repeat(false, expected_bits); + let all_zeros = BitVec::::repeat(false, expected_bits); let signing_context = SigningContext { parent_hash, session_index }; for unchecked_bitfield in unchecked_bitfields { // Find and skip invalid bitfields. diff --git a/runtime/parachains/src/paras_inherent/tests.rs b/runtime/parachains/src/paras_inherent/tests.rs index e8ff10b5ed99..eed7ebebbcfa 100644 --- a/runtime/parachains/src/paras_inherent/tests.rs +++ b/runtime/parachains/src/paras_inherent/tests.rs @@ -925,10 +925,10 @@ mod sanitizers { let validator_public = validator_pubkeys(&validators); let unchecked_bitfields = [ - BitVec::::repeat(true, expected_bits), - BitVec::::repeat(true, expected_bits), + BitVec::::repeat(true, expected_bits), + BitVec::::repeat(true, expected_bits), { - let mut bv = BitVec::::repeat(false, expected_bits); + let mut bv = BitVec::::repeat(false, expected_bits); bv.set(expected_bits - 1, true); bv }, diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index e581ee69a20b..6c04f8024569 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" build = "build.rs" [dependencies] -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index 99df6bb9e74d..574eea18e8a5 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" build = "build.rs" [dependencies] -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index 748b31d010b3..eb22f5ea6a7c 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" build = "build.rs" [dependencies] -bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } +bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } From 5b05ca131717725181d80cbe8f2cebbd90827a48 Mon Sep 17 00:00:00 2001 From: Wigy Date: Wed, 23 Feb 2022 16:23:37 +0100 Subject: [PATCH 4/8] Fix bitvec arithmetics --- bridges/primitives/messages/src/lib.rs | 6 +++++- runtime/parachains/src/disputes.rs | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bridges/primitives/messages/src/lib.rs b/bridges/primitives/messages/src/lib.rs index 8e893fab1dd7..bc873c67ea25 100644 --- a/bridges/primitives/messages/src/lib.rs +++ b/bridges/primitives/messages/src/lib.rs @@ -225,7 +225,11 @@ impl DeliveredMessages { DeliveredMessages { begin: nonce, end: nonce, - dispatch_results: if dispatch_result { bitvec![u8, Msb0; 1] } else { bitvec![u8, Msb0; 0] }, + dispatch_results: if dispatch_result { + bitvec![u8, Msb0; 1] + } else { + bitvec![u8, Msb0; 0] + }, } } diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs index 557622c89b8e..a938046b888d 100644 --- a/runtime/parachains/src/disputes.rs +++ b/runtime/parachains/src/disputes.rs @@ -671,10 +671,10 @@ impl DisputeStateImporter { .collect() }, (false, true) => { - let prev_participants = { - // all participants, which are not new participants - (self.state.validators_for.clone() | self.state.validators_against.clone()) & !self.new_participants.clone(); - }; + // all participants, which are not new participants + let prev_participants = (self.state.validators_for.clone() | + self.state.validators_against.clone()) & + !self.new_participants.clone(); prev_participants .iter_ones() From 31b2c3ad39e5f9274ac40d8436a724e5cf726c7f Mon Sep 17 00:00:00 2001 From: Wigy Date: Wed, 23 Feb 2022 16:39:00 +0100 Subject: [PATCH 5/8] Update Cargo.lock --- Cargo.lock | 377 ++++++++++++++++++++--------------------------------- 1 file changed, 140 insertions(+), 237 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 09e733bdcc7e..875787df7d9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -415,6 +415,12 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base58" version = "0.2.0" @@ -427,6 +433,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64ct" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874f8444adcb4952a8bc51305c8be95c8ec8237bb0d2e78d2e039f771f8828a0" + [[package]] name = "beef" version = "0.5.1" @@ -1117,6 +1129,12 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "const-oid" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1320,6 +1338,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +dependencies = [ + "generic-array 0.14.4", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.2" @@ -1449,6 +1479,15 @@ dependencies = [ "uuid", ] +[[package]] +name = "der" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +dependencies = [ + "const-oid", +] + [[package]] name = "derivative" version = "2.2.0" @@ -1619,6 +1658,17 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" +[[package]] +name = "ecdsa" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +dependencies = [ + "der", + "elliptic-curve", + "signature", +] + [[package]] name = "ed25519" version = "1.3.0" @@ -1648,6 +1698,24 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "elliptic-curve" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "ff", + "generic-array 0.14.4", + "group", + "rand_core 0.6.3", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "encoding_rs" version = "0.8.30" @@ -1824,6 +1892,16 @@ dependencies = [ "web-sys", ] +[[package]] +name = "ff" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2958d04124b9f27f175eaeb9a9f383d026098aa837eadd8ba22c11f13a05b9e" +dependencies = [ + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "file-per-thread-logger" version = "0.1.4" @@ -2465,6 +2543,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "group" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +dependencies = [ + "ff", + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "h2" version = "0.3.11" @@ -3229,6 +3318,18 @@ dependencies = [ "jsonrpsee-types 0.8.0", ] +[[package]] +name = "k256" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc5937366afd3b38071f400d1ce5bd8b1d40b5083cc14e6f8dbcc4032a7f5bb" +dependencies = [ + "cfg-if 1.0.0", + "ecdsa", + "elliptic-curve", + "sec1", +] + [[package]] name = "keccak" version = "0.1.0" @@ -4905,7 +5006,7 @@ dependencies = [ "frame-support", "frame-system", "hex", - "libsecp256k1", + "k256", "log", "pallet-beefy", "pallet-mmr", @@ -5949,6 +6050,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +dependencies = [ + "der", + "spki", + "zeroize", +] + [[package]] name = "pkg-config" version = "0.3.22" @@ -9293,6 +9405,19 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sec1" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +dependencies = [ + "der", + "generic-array 0.14.4", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -9549,6 +9674,9 @@ name = "signature" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +dependencies = [ + "rand_core 0.6.3", +] [[package]] name = "simba" @@ -10160,6 +10288,7 @@ dependencies = [ name = "sp-std" version = "4.0.0" + [[package]] name = "sp-storage" version = "5.0.0" @@ -10291,6 +10420,16 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "ss58-registry" version = "1.12.0" @@ -12282,239 +12421,3 @@ dependencies = [ "cc", "libc", ] - -[[patch.unused]] -name = "chain-spec-builder" -version = "2.0.0" - -[[patch.unused]] -name = "frame-support-test-compile-pass" -version = "4.0.0-dev" - -[[patch.unused]] -name = "node-bench" -version = "0.9.0-dev" - -[[patch.unused]] -name = "node-cli" -version = "3.0.0-dev" - -[[patch.unused]] -name = "node-executor" -version = "3.0.0-dev" - -[[patch.unused]] -name = "node-inspect" -version = "0.9.0-dev" - -[[patch.unused]] -name = "node-primitives" -version = "2.0.0" - -[[patch.unused]] -name = "node-rpc" -version = "3.0.0-dev" - -[[patch.unused]] -name = "node-runtime" -version = "3.0.0-dev" - -[[patch.unused]] -name = "node-runtime-generate-bags" -version = "3.0.0" - -[[patch.unused]] -name = "node-template" -version = "4.0.0-dev" - -[[patch.unused]] -name = "node-template-runtime" -version = "4.0.0-dev" - -[[patch.unused]] -name = "node-testing" -version = "3.0.0-dev" - -[[patch.unused]] -name = "pallet-asset-tx-payment" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-atomic-swap" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-aura" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-bags-list-fuzzer" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-child-bounties" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-contracts" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-contracts-primitives" -version = "5.0.0" - -[[patch.unused]] -name = "pallet-contracts-proc-macro" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-contracts-rpc" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-contracts-rpc-runtime-api" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-conviction-voting" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-example-basic" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-example-offchain-worker" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-example-parallel" -version = "3.0.0-dev" - -[[patch.unused]] -name = "pallet-lottery" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-node-authorization" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-randomness-collective-flip" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-referenda" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-scored-pool" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-template" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-transaction-storage" -version = "4.0.0-dev" - -[[patch.unused]] -name = "pallet-uniques" -version = "4.0.0-dev" - -[[patch.unused]] -name = "sc-consensus-aura" -version = "0.10.0-dev" - -[[patch.unused]] -name = "sc-consensus-manual-seal" -version = "0.10.0-dev" - -[[patch.unused]] -name = "sc-consensus-pow" -version = "0.10.0-dev" - -[[patch.unused]] -name = "sc-network-test" -version = "0.8.0" - -[[patch.unused]] -name = "sc-runtime-test" -version = "2.0.0" - -[[patch.unused]] -name = "sc-service-test" -version = "2.0.0" - -[[patch.unused]] -name = "sp-api-test" -version = "2.0.1" - -[[patch.unused]] -name = "sp-application-crypto-test" -version = "2.0.0" - -[[patch.unused]] -name = "sp-arithmetic-fuzzer" -version = "2.0.0" - -[[patch.unused]] -name = "sp-consensus-aura" -version = "0.10.0-dev" - -[[patch.unused]] -name = "sp-consensus-pow" -version = "0.10.0-dev" - -[[patch.unused]] -name = "sp-npos-elections-fuzzer" -version = "2.0.0-alpha.5" - -[[patch.unused]] -name = "sp-runtime-interface-test" -version = "2.0.0" - -[[patch.unused]] -name = "sp-runtime-interface-test-wasm" -version = "2.0.0" - -[[patch.unused]] -name = "sp-runtime-interface-test-wasm-deprecated" -version = "2.0.0" - -[[patch.unused]] -name = "sp-sandbox" -version = "0.10.0-dev" - -[[patch.unused]] -name = "sp-test-primitives" -version = "2.0.0" - -[[patch.unused]] -name = "subkey" -version = "2.0.1" - -[[patch.unused]] -name = "substrate-frame-cli" -version = "4.0.0-dev" - -[[patch.unused]] -name = "substrate-frame-rpc-support" -version = "3.0.0" - -[[patch.unused]] -name = "substrate-test-runtime" -version = "2.0.0" - -[[patch.unused]] -name = "substrate-test-runtime-client" -version = "2.0.0" - -[[patch.unused]] -name = "substrate-test-runtime-transaction-pool" -version = "2.0.0" - -[[patch.unused]] -name = "substrate-test-utils-test-crate" -version = "0.1.0" From c5c784ff6073f397a5afed01fa7fb8e992cc5a60 Mon Sep 17 00:00:00 2001 From: Wigy Date: Thu, 24 Feb 2022 15:39:43 +0100 Subject: [PATCH 6/8] Update sp-io --- Cargo.lock | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 162 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 763bacc2a894..9f792c9f2524 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -287,7 +287,6 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -451,6 +450,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "beefy-primitives", "fnv", @@ -479,6 +479,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -501,10 +502,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" [[package]] name = "beefy-primitives" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "scale-info", @@ -2021,6 +2024,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", ] @@ -2038,6 +2042,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -2059,6 +2064,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "Inflector", "chrono", @@ -2085,6 +2091,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -2098,6 +2105,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -2125,6 +2133,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "bitflags", "frame-metadata", @@ -2153,6 +2162,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2164,6 +2174,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", @@ -2175,6 +2186,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "proc-macro2", "quote", @@ -2184,6 +2196,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2206,6 +2219,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -2216,6 +2230,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "log", @@ -2232,6 +2247,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -2246,6 +2262,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "sp-api", @@ -2254,6 +2271,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "sp-api", @@ -2449,6 +2467,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "chrono", "frame-election-provider-support", @@ -4894,6 +4913,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -4907,6 +4927,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -4922,6 +4943,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -4936,6 +4958,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -4959,6 +4982,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4978,6 +5002,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-election-provider-support", "frame-support", @@ -4997,6 +5022,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5011,6 +5037,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "beefy-primitives", "frame-support", @@ -5026,6 +5053,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5050,6 +5078,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5133,6 +5162,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5149,6 +5179,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5164,6 +5195,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5186,6 +5218,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5203,6 +5236,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5217,6 +5251,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5239,6 +5274,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5254,6 +5290,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5273,6 +5310,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5289,6 +5327,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5305,6 +5344,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5322,6 +5362,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -5337,6 +5378,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5353,6 +5395,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5367,6 +5410,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -5380,6 +5424,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -5396,6 +5441,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5418,6 +5464,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5433,6 +5480,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5447,6 +5495,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -5460,6 +5509,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5475,6 +5525,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -5495,6 +5546,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5510,6 +5562,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -5523,6 +5576,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5545,6 +5599,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -5555,6 +5610,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "log", "sp-arithmetic", @@ -5563,6 +5619,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -5576,6 +5633,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5593,6 +5651,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5611,6 +5670,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-support", "frame-system", @@ -5627,6 +5687,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5643,6 +5704,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5653,6 +5715,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5669,6 +5732,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -5684,6 +5748,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-benchmarking", "frame-support", @@ -8132,6 +8197,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "env_logger 0.9.0", "jsonrpsee 0.8.0", @@ -8478,6 +8544,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "log", "sp-core", @@ -8488,6 +8555,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "futures 0.3.21", @@ -8514,6 +8582,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8536,6 +8605,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8551,6 +8621,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8567,6 +8638,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -8577,6 +8649,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "chrono", "clap", @@ -8614,6 +8687,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "fnv", "futures 0.3.21", @@ -8641,6 +8715,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "hash-db", "kvdb", @@ -8665,6 +8740,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "futures 0.3.21", @@ -8688,6 +8764,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "fork-tree", @@ -8730,6 +8807,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -8753,6 +8831,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8765,6 +8844,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "futures 0.3.21", @@ -8789,6 +8869,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "sc-client-api", "sp-authorship", @@ -8799,6 +8880,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "lazy_static", "libsecp256k1", @@ -8826,6 +8908,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "environmental", "parity-scale-codec", @@ -8842,6 +8925,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "log", "parity-scale-codec", @@ -8857,6 +8941,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8874,6 +8959,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "ahash", "async-trait", @@ -8912,6 +8998,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -8935,6 +9022,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "ansi_term", "futures 0.3.21", @@ -8951,6 +9039,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "hex", @@ -8965,8 +9054,8 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ - "async-std", "async-trait", "asynchronous-codec 0.5.0", "bitflags", @@ -9014,6 +9103,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "ahash", "futures 0.3.21", @@ -9030,6 +9120,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "bytes 1.1.0", "fnv", @@ -9057,6 +9148,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "libp2p", @@ -9069,6 +9161,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9077,6 +9170,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "hash-db", @@ -9107,6 +9201,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9131,6 +9226,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9147,6 +9243,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "directories", @@ -9210,6 +9307,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "log", "parity-scale-codec", @@ -9223,6 +9321,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9243,6 +9342,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "chrono", "futures 0.3.21", @@ -9260,6 +9360,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "ansi_term", "atty", @@ -9290,6 +9391,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -9300,6 +9402,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9326,6 +9429,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "log", @@ -9338,6 +9442,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9813,6 +9918,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "hash-db", "log", @@ -9829,6 +9935,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "blake2 0.10.2", "proc-macro-crate 1.1.3", @@ -9840,6 +9947,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "scale-info", @@ -9852,6 +9960,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "integer-sqrt", "num-traits", @@ -9866,6 +9975,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "scale-info", @@ -9878,6 +9988,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "parity-scale-codec", @@ -9889,6 +10000,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "sp-api", @@ -9900,6 +10012,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "log", @@ -9917,6 +10030,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "futures 0.3.21", @@ -9935,6 +10049,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "merlin", @@ -9957,6 +10072,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "scale-info", @@ -9970,6 +10086,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9981,6 +10098,7 @@ dependencies = [ [[package]] name = "sp-core" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "base58", "bitflags", @@ -10025,6 +10143,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "blake2 0.10.2", "byteorder", @@ -10038,6 +10157,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "proc-macro2", "quote", @@ -10048,6 +10168,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -10056,6 +10177,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "proc-macro2", "quote", @@ -10065,6 +10187,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.11.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "environmental", "parity-scale-codec", @@ -10075,6 +10198,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "finality-grandpa", "log", @@ -10092,6 +10216,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10105,6 +10230,7 @@ dependencies = [ [[package]] name = "sp-io" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "hash-db", @@ -10128,6 +10254,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "lazy_static", "sp-core", @@ -10138,6 +10265,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.11.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "futures 0.3.21", @@ -10154,6 +10282,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "thiserror", "zstd", @@ -10162,6 +10291,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "scale-info", @@ -10176,6 +10306,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10186,6 +10317,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "sp-api", "sp-core", @@ -10195,6 +10327,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "backtrace", "lazy_static", @@ -10204,6 +10337,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "rustc-hash", "serde", @@ -10213,6 +10347,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "either", "hash256-std-hasher", @@ -10234,6 +10369,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10250,6 +10386,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -10261,6 +10398,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "serde", "serde_json", @@ -10269,6 +10407,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "scale-info", @@ -10282,6 +10421,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "scale-info", @@ -10292,6 +10432,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.11.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "hash-db", "log", @@ -10314,11 +10455,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" - +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" [[package]] name = "sp-storage" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10331,6 +10473,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "log", "sp-core", @@ -10343,6 +10486,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "futures-timer", @@ -10358,6 +10502,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "sp-std", @@ -10369,6 +10514,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "sp-api", "sp-runtime", @@ -10377,6 +10523,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "log", @@ -10392,6 +10539,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "hash-db", "memory-db", @@ -10406,6 +10554,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10422,6 +10571,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10432,6 +10582,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "impl-trait-for-tuples", "log", @@ -10631,6 +10782,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "platforms", ] @@ -10638,6 +10790,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -10659,8 +10812,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ - "async-std", "futures-util", "hyper", "log", @@ -10672,6 +10825,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "async-trait", "futures 0.3.21", @@ -10697,6 +10851,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "futures 0.3.21", "substrate-test-utils-derive", @@ -10706,6 +10861,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10716,6 +10872,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "ansi_term", "build-helper", @@ -11334,6 +11491,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c22fce5a311beede13479c9a00cca85d823b6b00" dependencies = [ "clap", "jsonrpsee 0.4.1", From 2ac0e0b791f7fa60a5a24c519944814a5441978e Mon Sep 17 00:00:00 2001 From: Wigy Date: Thu, 24 Feb 2022 16:25:22 +0100 Subject: [PATCH 7/8] Fixing the build --- bridges/primitives/messages/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/primitives/messages/src/lib.rs b/bridges/primitives/messages/src/lib.rs index bc873c67ea25..e657214a7a9c 100644 --- a/bridges/primitives/messages/src/lib.rs +++ b/bridges/primitives/messages/src/lib.rs @@ -369,7 +369,7 @@ mod tests { messages: DeliveredMessages::new(i as _, true), }; entry.messages.dispatch_results = bitvec![ - Msb0, u8; + u8, Msb0; 1; (messages_count / relayer_entries) as _ ]; From 13e73b770fd696b092ff4125f05ea748b3206465 Mon Sep 17 00:00:00 2001 From: Wigy Date: Thu, 24 Feb 2022 19:23:08 +0100 Subject: [PATCH 8/8] Yanked scale-info 2.0.0 --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f792c9f2524..8c130152d96e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9453,9 +9453,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3b4d0b178e3af536f7988303bc73a0766c816de2138c08262015f8ec7be568" +checksum = "0563970d79bcbf3c537ce3ad36d859b30d36fc5b190efd227f1f7a84d7cf0d42" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -11558,7 +11558,7 @@ version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "digest 0.10.2", "rand 0.8.5", "static_assertions",