From 224206fc0fba37088bb7aaf9695d283a69370cb6 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Mon, 28 Nov 2022 11:18:37 -0500 Subject: [PATCH 1/8] Begin removing `parity-util-mem`; remove `collect_memory_stats` --- Cargo.lock | 62 +++++----------- Cargo.toml | 1 - core-primitives/Cargo.toml | 2 - core-primitives/src/lib.rs | 6 -- node/core/runtime-api/Cargo.toml | 1 - node/malus/Cargo.toml | 1 - node/overseer/Cargo.toml | 1 - node/overseer/src/lib.rs | 29 -------- node/overseer/src/metrics.rs | 9 --- node/subsystem-util/Cargo.toml | 1 - node/subsystem-util/src/database.rs | 14 ---- parachain/Cargo.toml | 2 - parachain/src/primitives.rs | 12 +-- primitives/Cargo.toml | 2 - primitives/src/v2/mod.rs | 109 ++++------------------------ 15 files changed, 39 insertions(+), 213 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f8c46862ef44..0a605f75abfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2074,7 +2074,7 @@ dependencies = [ "handlebars", "hash-db", "itertools", - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static", "linked-hash-map", "log", @@ -3331,6 +3331,13 @@ dependencies = [ "log", ] +[[package]] +name = "kvdb" +version = "0.12.0" +dependencies = [ + "smallvec", +] + [[package]] name = "kvdb" version = "0.12.0" @@ -3347,7 +3354,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" dependencies = [ - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-util-mem", "parking_lot 0.12.1", ] @@ -3358,7 +3365,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" dependencies = [ - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "log", "num_cpus", "parity-util-mem", @@ -3374,7 +3381,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de82a1adb7ade192c0090dd56d059a626191c0638c795eb68aff4b0bd2c1f9be" dependencies = [ - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5657,8 +5664,6 @@ dependencies = [ "parking_lot 0.12.1", "primitive-types", "smallvec", - "tikv-jemalloc-ctl", - "tikv-jemallocator", "winapi", ] @@ -5889,7 +5894,6 @@ dependencies = [ "assert_cmd", "color-eyre", "nix 0.24.1", - "parity-util-mem", "polkadot-cli", "polkadot-core-primitives", "substrate-rpc-client", @@ -6106,7 +6110,6 @@ name = "polkadot-core-primitives" version = "0.9.31" dependencies = [ "parity-scale-codec", - "parity-util-mem", "scale-info", "sp-core", "sp-runtime", @@ -6243,7 +6246,7 @@ dependencies = [ "derive_more", "futures", "futures-timer", - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-memorydb", "lru", "merlin", @@ -6281,7 +6284,7 @@ dependencies = [ "env_logger 0.9.0", "futures", "futures-timer", - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-memorydb", "log", "parity-scale-codec", @@ -6391,7 +6394,7 @@ dependencies = [ "assert_matches", "futures", "futures-timer", - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-memorydb", "parity-scale-codec", "parking_lot 0.12.1", @@ -6413,7 +6416,7 @@ dependencies = [ "fatality", "futures", "futures-timer", - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-memorydb", "lru", "parity-scale-codec", @@ -6532,7 +6535,6 @@ version = "0.9.31" dependencies = [ "futures", "memory-lru", - "parity-util-mem", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", @@ -6698,7 +6700,7 @@ dependencies = [ "fatality", "futures", "itertools", - "kvdb", + "kvdb 0.12.0", "kvdb-memorydb", "kvdb-shared-tests", "lazy_static", @@ -6706,7 +6708,6 @@ dependencies = [ "lru", "parity-db", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.11.2", "pin-project", "polkadot-node-jaeger", @@ -6739,7 +6740,6 @@ dependencies = [ "futures-timer", "lru", "orchestra", - "parity-util-mem", "parking_lot 0.12.1", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -6761,7 +6761,6 @@ dependencies = [ "derive_more", "frame-support", "parity-scale-codec", - "parity-util-mem", "polkadot-core-primitives", "scale-info", "serde", @@ -6791,7 +6790,6 @@ dependencies = [ "bitvec", "hex-literal", "parity-scale-codec", - "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", "scale-info", @@ -7090,7 +7088,7 @@ dependencies = [ "hex-literal", "kusama-runtime", "kusama-runtime-constants", - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-rocksdb", "log", "lru", @@ -7263,7 +7261,6 @@ dependencies = [ "color-eyre", "futures", "futures-timer", - "parity-util-mem", "polkadot-cli", "polkadot-erasure-coding", "polkadot-node-core-backing", @@ -8523,7 +8520,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#6cb4b6799de6f784f4c42eb01a76a8fa67039a67" dependencies = [ "hash-db", - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-memorydb", "kvdb-rocksdb", "linked-hash-map", @@ -10118,7 +10115,7 @@ name = "sp-database" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#6cb4b6799de6f784f4c42eb01a76a8fa67039a67" dependencies = [ - "kvdb", + "kvdb 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.12.1", ] @@ -11191,17 +11188,6 @@ dependencies = [ "threadpool", ] -[[package]] -name = "tikv-jemalloc-ctl" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" -dependencies = [ - "libc", - "paste", - "tikv-jemalloc-sys", -] - [[package]] name = "tikv-jemalloc-sys" version = "0.5.2+5.3.0-patched" @@ -11213,16 +11199,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tikv-jemallocator" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - [[package]] name = "time" version = "0.1.44" diff --git a/Cargo.toml b/Cargo.toml index 4b0e2047bf64..be00e59a5bbe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,6 @@ readme = "README.md" [dependencies] polkadot-cli = { path = "cli", features = [ "kusama-native", "westend-native", "rococo-native" ] } color-eyre = { version = "0.6.1", default-features = false } -parity-util-mem = { version = "0.12.0", default-features = false, features = ["jemalloc-global"] } [dev-dependencies] assert_cmd = "2.0.4" diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index 2c6fe070522d..d73f373bb87e 100644 --- a/core-primitives/Cargo.toml +++ b/core-primitives/Cargo.toml @@ -10,7 +10,6 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", d sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } parity-scale-codec = { version = "3.1.5", default-features = false, features = [ "derive" ] } -parity-util-mem = { version = "0.12.0", default-features = false, optional = true } [features] default = [ "std" ] @@ -21,5 +20,4 @@ std = [ "sp-std/std", "scale-info/std", "parity-scale-codec/std", - "parity-util-mem", ] diff --git a/core-primitives/src/lib.rs b/core-primitives/src/lib.rs index bd0256dc7c9e..ca4d2372db38 100644 --- a/core-primitives/src/lib.rs +++ b/core-primitives/src/lib.rs @@ -21,8 +21,6 @@ //! These core Polkadot types are used by the relay chain and the Parachains. use parity_scale_codec::{Decode, Encode}; -#[cfg(feature = "std")] -use parity_util_mem::MallocSizeOf; use scale_info::TypeInfo; use sp_runtime::{ generic, @@ -66,7 +64,6 @@ pub type Hash = sp_core::H256; /// /// This type makes it easy to enforce that a hash is a candidate hash on the type level. #[derive(Clone, Copy, Encode, Decode, Hash, Eq, PartialEq, Default, PartialOrd, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub struct CandidateHash(pub Hash); #[cfg(feature = "std")] @@ -127,7 +124,6 @@ pub type DownwardMessage = sp_std::vec::Vec; /// A wrapped version of `DownwardMessage`. The difference is that it has attached the block number when /// the message was sent. #[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub struct InboundDownwardMessage { /// The block number at which these messages were put into the downward message queue. pub sent_at: BlockNumber, @@ -137,7 +133,6 @@ pub struct InboundDownwardMessage { /// An HRMP message seen from the perspective of a recipient. #[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub struct InboundHrmpMessage { /// The block number at which this message was sent. /// Specifically, it is the block number at which the candidate that sends this message was @@ -149,7 +144,6 @@ pub struct InboundHrmpMessage { /// An HRMP message seen from the perspective of a sender. #[derive(Encode, Decode, Clone, sp_runtime::RuntimeDebug, PartialEq, Eq, Hash, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub struct OutboundHrmpMessage { /// The para that will get this message in its downward message queue. pub recipient: Id, diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml index ff7ea662603c..b0cd23fcee77 100644 --- a/node/core/runtime-api/Cargo.toml +++ b/node/core/runtime-api/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" futures = "0.3.21" gum = { package = "tracing-gum", path = "../../gum" } memory-lru = "0.1.1" -parity-util-mem = { version = "0.12.0", default-features = false } sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/malus/Cargo.toml b/node/malus/Cargo.toml index 2f78fa43bdf2..5ff7511276f1 100644 --- a/node/malus/Cargo.toml +++ b/node/malus/Cargo.toml @@ -23,7 +23,6 @@ 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.12.0", default-features = false, features = ["jemalloc-global"] } color-eyre = { version = "0.6.1", default-features = false } assert_matches = "1.5" async-trait = "0.1.57" diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 3aaa74e22da1..6eca6425e9e5 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -18,7 +18,6 @@ polkadot-primitives = { path = "../../primitives" } orchestra = "0.0.2" gum = { package = "tracing-gum", path = "../gum" } lru = "0.8" -parity-util-mem = { version = "0.12.0", default-features = false } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } async-trait = "0.1.57" diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index 70dbe92b2432..d61e30130a4c 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -101,8 +101,6 @@ pub use polkadot_node_metrics::{ Metronome, }; -use parity_util_mem::MemoryAllocationTracker; - pub use orchestra as gen; pub use orchestra::{ contextbounds, orchestra, subsystem, FromOrchestra, MapSubsystem, MessagePacket, @@ -651,34 +649,7 @@ where } let subsystem_meters = overseer.map_subsystems(ExtractNameAndMeters); - let collect_memory_stats: Box = - match MemoryAllocationTracker::new() { - Ok(memory_stats) => - Box::new(move |metrics: &OverseerMetrics| match memory_stats.snapshot() { - Ok(memory_stats_snapshot) => { - gum::trace!( - target: LOG_TARGET, - "memory_stats: {:?}", - &memory_stats_snapshot - ); - metrics.memory_stats_snapshot(memory_stats_snapshot); - }, - Err(e) => - gum::debug!(target: LOG_TARGET, "Failed to obtain memory stats: {:?}", e), - }), - Err(_) => { - gum::debug!( - target: LOG_TARGET, - "Memory allocation tracking is not supported by the allocator.", - ); - - Box::new(|_| {}) - }, - }; - let metronome = Metronome::new(std::time::Duration::from_millis(950)).for_each(move |_| { - collect_memory_stats(&metronome_metrics); - // We combine the amount of messages from subsystems to the overseer // as well as the amount of messages from external sources to the overseer // into one `to_overseer` value. diff --git a/node/overseer/src/metrics.rs b/node/overseer/src/metrics.rs index 71295dd2238c..4ac9b3b5fdca 100644 --- a/node/overseer/src/metrics.rs +++ b/node/overseer/src/metrics.rs @@ -19,8 +19,6 @@ use super::*; pub use polkadot_node_metrics::metrics::{self, prometheus, Metrics as MetricsTrait}; -use parity_util_mem::MemoryAllocationSnapshot; - /// Overseer Prometheus metrics. #[derive(Clone)] struct MetricsInner { @@ -67,13 +65,6 @@ impl Metrics { } } - pub(crate) fn memory_stats_snapshot(&self, memory_stats: MemoryAllocationSnapshot) { - if let Some(metrics) = &self.0 { - metrics.memory_stats_allocated.set(memory_stats.allocated); - metrics.memory_stats_resident.set(memory_stats.resident); - } - } - pub(crate) fn channel_metrics_snapshot( &self, collection: impl IntoIterator, diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml index d390fd2b42cc..45465e44bad7 100644 --- a/node/subsystem-util/Cargo.toml +++ b/node/subsystem-util/Cargo.toml @@ -33,7 +33,6 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } kvdb = "0.12.0" -parity-util-mem = { version = "0.12.0", default-features = false } parity-db = { version = "0.4.2"} [dev-dependencies] diff --git a/node/subsystem-util/src/database.rs b/node/subsystem-util/src/database.rs index 6f338b5d6440..d29a4460ea7e 100644 --- a/node/subsystem-util/src/database.rs +++ b/node/subsystem-util/src/database.rs @@ -29,7 +29,6 @@ pub trait Database: KeyValueDB { pub mod kvdb_impl { use super::{DBKeyValue, DBTransaction, DBValue, Database, KeyValueDB}; use kvdb::{DBOp, IoStats, IoStatsKind}; - use parity_util_mem::{MallocSizeOf, MallocSizeOfOps}; use std::{collections::BTreeSet, io::Result}; /// Adapter implementing subsystem database @@ -123,13 +122,6 @@ pub mod kvdb_impl { self.db.has_prefix(col, prefix) } } - - impl MallocSizeOf for DbAdapter { - fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { - // ignore filter set - self.db.size_of(ops) - } - } } /// Utilities for using parity-db database. @@ -160,12 +152,6 @@ pub mod paritydb_impl { write_lock: Arc>, } - impl parity_util_mem::MallocSizeOf for DbAdapter { - fn size_of(&self, _ops: &mut parity_util_mem::MallocSizeOfOps) -> usize { - unimplemented!("size_of is not supported for parity_db") - } - } - impl KeyValueDB for DbAdapter { fn transaction(&self) -> DBTransaction { DBTransaction::new() diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 665a7b0986cc..2cb344607af7 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -10,7 +10,6 @@ edition = "2021" # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing # various unnecessary Substrate-specific endpoints. parity-scale-codec = { version = "3.1.5", default-features = false, features = [ "derive" ] } -parity-util-mem = { version = "0.12.0", default-features = false, optional = true } scale-info = { version = "2.1.2", 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 } @@ -32,7 +31,6 @@ std = [ "sp-std/std", "sp-runtime/std", "sp-core/std", - "parity-util-mem", "polkadot-core-primitives/std", "frame-support/std", ] diff --git a/parachain/src/primitives.rs b/parachain/src/primitives.rs index 2c18b178271f..f9fa9be0af31 100644 --- a/parachain/src/primitives.rs +++ b/parachain/src/primitives.rs @@ -31,9 +31,6 @@ use serde::{Deserialize, Serialize}; #[cfg(feature = "std")] use sp_core::bytes; -#[cfg(feature = "std")] -use parity_util_mem::MallocSizeOf; - use polkadot_core_primitives::{Hash, OutboundHrmpMessage}; /// Block number type used by the relay chain. @@ -43,7 +40,7 @@ pub use polkadot_core_primitives::BlockNumber as RelayChainBlockNumber; #[derive( PartialEq, Eq, Clone, PartialOrd, Ord, Encode, Decode, RuntimeDebug, derive_more::From, TypeInfo, )] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, MallocSizeOf, Default))] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, Default))] pub struct HeadData(#[cfg_attr(feature = "std", serde(with = "bytes"))] pub Vec); impl HeadData { @@ -55,7 +52,7 @@ impl HeadData { /// Parachain validation code. #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, derive_more::From, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash))] pub struct ValidationCode(#[cfg_attr(feature = "std", serde(with = "bytes"))] pub Vec); impl ValidationCode { @@ -71,7 +68,6 @@ impl ValidationCode { /// /// This type makes it easy to enforce that a hash is a validation code hash on the type level. #[derive(Clone, Copy, Encode, Decode, Hash, Eq, PartialEq, PartialOrd, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub struct ValidationCodeHash(Hash); impl sp_std::fmt::Display for ValidationCodeHash { @@ -114,7 +110,7 @@ impl sp_std::fmt::LowerHex for ValidationCodeHash { /// /// Contains everything required to validate para-block, may contain block and witness data. #[derive(PartialEq, Eq, Clone, Encode, Decode, derive_more::From, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] pub struct BlockData(#[cfg_attr(feature = "std", serde(with = "bytes"))] pub Vec); /// Unique identifier of a parachain. @@ -136,7 +132,7 @@ pub struct BlockData(#[cfg_attr(feature = "std", serde(with = "bytes"))] pub Vec )] #[cfg_attr( feature = "std", - derive(serde::Serialize, serde::Deserialize, derive_more::Display, MallocSizeOf) + derive(serde::Serialize, serde::Deserialize, derive_more::Display) )] pub struct Id(u32); diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index b99ac7bc19e6..791c6d94a678 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } hex-literal = "0.3.4" parity-scale-codec = { version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] } -parity-util-mem = { version = "0.12.0", default-features = false, optional = true } scale-info = { version = "2.1.2", default-features = false, features = ["bit-vec", "derive"] } serde = { version = "1.0.137", optional = true, features = ["derive"] } @@ -46,7 +45,6 @@ std = [ "sp-arithmetic/std", "runtime_primitives/std", "serde", - "parity-util-mem", "polkadot-parachain/std", "polkadot-core-primitives/std", "bitvec/std", diff --git a/primitives/src/v2/mod.rs b/primitives/src/v2/mod.rs index ea1f4fcca0b9..a396ba5b0d21 100644 --- a/primitives/src/v2/mod.rs +++ b/primitives/src/v2/mod.rs @@ -47,8 +47,6 @@ pub use polkadot_parachain::primitives::{ LOWEST_PUBLIC_ID, LOWEST_USER_ID, }; -#[cfg(feature = "std")] -use parity_util_mem::{MallocSizeOf, MallocSizeOfOps}; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; @@ -77,16 +75,6 @@ mod collator_app { /// Identity that collators use. pub type CollatorId = collator_app::Public; -#[cfg(feature = "std")] -impl MallocSizeOf for CollatorId { - fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize { - 0 - } - fn constant_size() -> Option { - Some(0) - } -} - /// A Parachain collator keypair. #[cfg(feature = "std")] pub type CollatorPair = collator_app::Pair; @@ -94,16 +82,6 @@ pub type CollatorPair = collator_app::Pair; /// Signature on candidate's block data by a collator. pub type CollatorSignature = collator_app::Signature; -#[cfg(feature = "std")] -impl MallocSizeOf for CollatorSignature { - fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize { - 0 - } - fn constant_size() -> Option { - Some(0) - } -} - /// The key type ID for a parachain validator key. pub const PARACHAIN_KEY_TYPE_ID: KeyTypeId = KeyTypeId(*b"para"); @@ -118,16 +96,6 @@ mod validator_app { /// so we define it to be the same type as `SessionKey`. In the future it may have different crypto. pub type ValidatorId = validator_app::Public; -#[cfg(feature = "std")] -impl MallocSizeOf for ValidatorId { - fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize { - 0 - } - fn constant_size() -> Option { - Some(0) - } -} - /// Trait required for type specific indices e.g. `ValidatorIndex` and `GroupIndex` pub trait TypeIndex { /// Returns the index associated to this value. @@ -136,7 +104,7 @@ pub trait TypeIndex { /// Index of the validator is used as a lightweight replacement of the `ValidatorId` when appropriate. #[derive(Eq, Ord, PartialEq, PartialOrd, Copy, Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash))] pub struct ValidatorIndex(pub u32); // We should really get https://github.com/paritytech/polkadot/issues/2403 going .. @@ -163,16 +131,6 @@ application_crypto::with_pair! { /// so we define it to be the same type as `SessionKey`. In the future it may have different crypto. pub type ValidatorSignature = validator_app::Signature; -#[cfg(feature = "std")] -impl MallocSizeOf for ValidatorSignature { - fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize { - 0 - } - fn constant_size() -> Option { - Some(0) - } -} - /// A declarations of storage keys where an external observer can find some interesting data. pub mod well_known_keys { use super::{HrmpChannelId, Id}; @@ -406,16 +364,6 @@ application_crypto::with_pair! { pub type AssignmentPair = assignment_app::Pair; } -#[cfg(feature = "std")] -impl MallocSizeOf for AssignmentId { - fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize { - 0 - } - fn constant_size() -> Option { - Some(0) - } -} - /// The index of the candidate in the list of candidates fully included as-of the block. pub type CandidateIndex = u32; @@ -465,7 +413,7 @@ fn check_collator_signature>( /// A unique descriptor of the candidate receipt. #[derive(PartialEq, Eq, Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Hash, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(Hash))] pub struct CandidateDescriptor { /// The ID of the para this is a candidate for. pub para_id: Id, @@ -507,7 +455,6 @@ impl> CandidateDescriptor { /// A candidate-receipt. #[derive(PartialEq, Eq, Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub struct CandidateReceipt { /// The descriptor of the candidate. pub descriptor: CandidateDescriptor, @@ -544,7 +491,7 @@ pub struct FullCandidateReceipt { /// A candidate-receipt with commitments directly included. #[derive(PartialEq, Eq, Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Hash, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(Hash))] pub struct CommittedCandidateReceipt { /// The descriptor of the candidate. pub descriptor: CandidateDescriptor, @@ -625,7 +572,7 @@ impl Ord for CommittedCandidateReceipt { /// The `PersistedValidationData` should be relatively lightweight primarily because it is constructed /// during inclusion for each candidate and therefore lies on the critical path of inclusion. #[derive(PartialEq, Eq, Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Default, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(Default))] pub struct PersistedValidationData { /// The parent head-data. pub parent_head: HeadData, @@ -646,7 +593,7 @@ impl PersistedValidationData { /// Commitments made in a `CandidateReceipt`. Many of these are outputs of validation. #[derive(PartialEq, Eq, Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Hash, MallocSizeOf, Default))] +#[cfg_attr(feature = "std", derive(Hash, Default))] pub struct CandidateCommitments { /// Messages destined to be interpreted by the Relay chain itself. pub upward_messages: Vec, @@ -787,7 +734,7 @@ pub fn check_candidate_backing + Clone + Encode>( #[derive( Encode, Decode, Default, PartialOrd, Ord, Eq, PartialEq, Clone, Copy, TypeInfo, RuntimeDebug, )] -#[cfg_attr(feature = "std", derive(Hash, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(Hash))] pub struct CoreIndex(pub u32); impl From for CoreIndex { @@ -804,7 +751,7 @@ impl TypeIndex for CoreIndex { /// The unique (during session) index of a validator group. #[derive(Encode, Decode, Default, Clone, Copy, Debug, PartialEq, Eq, TypeInfo)] -#[cfg_attr(feature = "std", derive(Hash, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(Hash))] pub struct GroupIndex(pub u32); impl From for GroupIndex { @@ -846,7 +793,7 @@ pub enum CoreOccupied { /// A helper data-type for tracking validator-group rotations. #[derive(Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(PartialEq))] pub struct GroupRotationInfo { /// The block number where the session started. pub session_start_block: N, @@ -934,7 +881,7 @@ impl GroupRotationInfo { /// Information about a core which is currently occupied. #[derive(Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(PartialEq))] pub struct OccupiedCore { // NOTE: this has no ParaId as it can be deduced from the candidate descriptor. /// If this core is freed by availability, this is the assignment that is next up on this @@ -951,7 +898,6 @@ pub struct OccupiedCore { /// A bitfield with 1 bit for each validator in the set. `1` bits mean that the corresponding /// 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, /// The group assigned to distribute availability pieces of this candidate. pub group_responsible: GroupIndex, @@ -970,7 +916,7 @@ impl OccupiedCore { /// Information about a core which is currently occupied. #[derive(Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(PartialEq))] pub struct ScheduledCore { /// The ID of a para scheduled. pub para_id: Id, @@ -980,7 +926,7 @@ pub struct ScheduledCore { /// The state of a particular availability core. #[derive(Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(PartialEq))] pub enum CoreState { /// The core is currently occupied. #[codec(index = 0)] @@ -1031,7 +977,7 @@ pub enum OccupiedCoreAssumption { /// An even concerning a candidate. #[derive(Clone, Encode, Decode, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(PartialEq))] pub enum CandidateEvent { /// This candidate receipt was backed in the most recent block. /// This includes the core index the candidate is now occupying. @@ -1050,7 +996,7 @@ pub enum CandidateEvent { /// Scraped runtime backing votes and resolved disputes. #[derive(Clone, Encode, Decode, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(PartialEq))] pub struct ScrapedOnChainVotes { /// The session in which the block was included. pub session: SessionIndex, @@ -1239,7 +1185,6 @@ impl From for runtime_primitives::DigestItem { /// /// Statements are either in favor of the candidate's validity or against it. #[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub enum DisputeStatement { /// A valid statement, of the given kind. #[codec(index = 0)] @@ -1320,7 +1265,6 @@ impl DisputeStatement { /// Different kinds of statements of validity on a candidate. #[derive(Encode, Decode, Copy, Clone, PartialEq, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub enum ValidDisputeStatementKind { /// An explicit statement issued as part of a dispute. #[codec(index = 0)] @@ -1338,7 +1282,6 @@ pub enum ValidDisputeStatementKind { /// Different kinds of statements of invalidity on a candidate. #[derive(Encode, Decode, Copy, Clone, PartialEq, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub enum InvalidDisputeStatementKind { /// An explicit statement issued as part of a dispute. #[codec(index = 0)] @@ -1367,7 +1310,6 @@ impl ExplicitDisputeStatement { /// A set of statements about a specific candidate. #[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub struct DisputeStatementSet { /// The candidate referenced by this set. pub candidate_hash: CandidateHash, @@ -1432,22 +1374,6 @@ pub struct DisputeState { pub concluded_at: Option, } -#[cfg(feature = "std")] -impl MallocSizeOf for DisputeState { - fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { - // destructuring to make sure no new fields are added to the struct without modifying this function - let Self { validators_for, validators_against, start, concluded_at } = self; - - // According to the documentation `.capacity()` might not return a byte aligned value, so just in case: - let align_eight = |d: usize| (d + 7) / 8; - - align_eight(validators_for.capacity()) + - align_eight(validators_against.capacity()) + - start.size_of(ops) + - concluded_at.size_of(ops) - } -} - /// Parachains inherent-data passed into the runtime by a block author #[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug, TypeInfo)] pub struct InherentData { @@ -1464,7 +1390,6 @@ pub struct InherentData { /// An either implicit or explicit attestation to the validity of a parachain /// candidate. #[derive(Clone, Eq, PartialEq, Decode, Encode, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(MallocSizeOf))] pub enum ValidityAttestation { /// Implicit validity attestation by issuing. /// This corresponds to issuance of a `Candidate` statement. @@ -1600,7 +1525,7 @@ impl CompactStatement { /// `IndexedVec` struct indexed by type specific indices. #[derive(Clone, Encode, Decode, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(PartialEq))] pub struct IndexedVec(Vec, PhantomData K>); impl Default for IndexedVec { @@ -1679,7 +1604,7 @@ pub fn supermajority_threshold(n: usize) -> usize { /// Information about validator sets of a session. #[derive(Clone, Encode, Decode, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(PartialEq))] pub struct SessionInfo { /****** New in v2 *******/ /// All the validators actively participating in parachain consensus. @@ -1705,7 +1630,6 @@ pub struct SessionInfo { /// `validators`, afterwards any remaining authorities can be found. This is any authorities not /// participating in parachain consensus - see /// [`max_validators`](https://github.com/paritytech/polkadot/blob/a52dca2be7840b23c19c153cf7e110b1e3e475f8/runtime/parachains/src/configuration.rs#L148) - #[cfg_attr(feature = "std", ignore_malloc_size_of = "outside type")] pub discovery_keys: Vec, /// The assignment keys for validators. /// @@ -1765,7 +1689,7 @@ impl PvfCheckStatement { /// Old, v1-style info about session info. Only needed for limited /// backwards-compatibility. #[derive(Clone, Encode, Decode, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))] +#[cfg_attr(feature = "std", derive(PartialEq))] pub struct OldV1SessionInfo { /// Validators in canonical ordering. /// @@ -1781,7 +1705,6 @@ pub struct OldV1SessionInfo { /// `validators`, afterwards any remaining authorities can be found. This is any authorities not /// participating in parachain consensus - see /// [`max_validators`](https://github.com/paritytech/polkadot/blob/a52dca2be7840b23c19c153cf7e110b1e3e475f8/runtime/parachains/src/configuration.rs#L148) - #[cfg_attr(feature = "std", ignore_malloc_size_of = "outside type")] pub discovery_keys: Vec, /// The assignment keys for validators. /// From cafa73fa1ee96cfaed63eb8fb10a23e806291880 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 1 Dec 2022 09:56:18 -0500 Subject: [PATCH 2/8] Update some dependencies that were using `parity-util-mem` --- Cargo.lock | 73 +++++++++++++++++------- node/core/approval-voting/Cargo.toml | 4 +- node/core/av-store/Cargo.toml | 4 +- node/core/chain-selection/Cargo.toml | 4 +- node/core/dispute-coordinator/Cargo.toml | 4 +- node/service/Cargo.toml | 4 +- node/subsystem-util/Cargo.toml | 4 +- parachain/src/primitives.rs | 5 +- 8 files changed, 66 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5fa83bb7feaa..e07bf8a99118 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2074,7 +2074,7 @@ dependencies = [ "handlebars", "hash-db", "itertools", - "kvdb", + "kvdb 0.12.0", "lazy_static", "linked-hash-map", "log", @@ -3341,24 +3341,43 @@ dependencies = [ "smallvec", ] +[[package]] +name = "kvdb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9" +dependencies = [ + "smallvec", +] + [[package]] name = "kvdb-memorydb" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" dependencies = [ - "kvdb", + "kvdb 0.12.0", "parity-util-mem", "parking_lot 0.12.1", ] +[[package]] +name = "kvdb-memorydb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" +dependencies = [ + "kvdb 0.13.0", + "parking_lot 0.12.1", +] + [[package]] name = "kvdb-rocksdb" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" dependencies = [ - "kvdb", + "kvdb 0.12.0", "log", "num_cpus", "parity-util-mem", @@ -3368,13 +3387,27 @@ dependencies = [ "smallvec", ] +[[package]] +name = "kvdb-rocksdb" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" +dependencies = [ + "kvdb 0.13.0", + "num_cpus", + "parking_lot 0.12.1", + "regex", + "rocksdb", + "smallvec", +] + [[package]] name = "kvdb-shared-tests" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de82a1adb7ade192c0090dd56d059a626191c0638c795eb68aff4b0bd2c1f9be" dependencies = [ - "kvdb", + "kvdb 0.12.0", ] [[package]] @@ -6249,8 +6282,8 @@ dependencies = [ "derive_more", "futures", "futures-timer", - "kvdb", - "kvdb-memorydb", + "kvdb 0.13.0", + "kvdb-memorydb 0.13.0", "lru", "merlin", "parity-scale-codec", @@ -6287,8 +6320,8 @@ dependencies = [ "env_logger 0.9.0", "futures", "futures-timer", - "kvdb", - "kvdb-memorydb", + "kvdb 0.13.0", + "kvdb-memorydb 0.13.0", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -6397,8 +6430,8 @@ dependencies = [ "assert_matches", "futures", "futures-timer", - "kvdb", - "kvdb-memorydb", + "kvdb 0.13.0", + "kvdb-memorydb 0.13.0", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", @@ -6419,8 +6452,8 @@ dependencies = [ "fatality", "futures", "futures-timer", - "kvdb", - "kvdb-memorydb", + "kvdb 0.13.0", + "kvdb-memorydb 0.13.0", "lru", "parity-scale-codec", "polkadot-node-primitives", @@ -6703,8 +6736,8 @@ dependencies = [ "fatality", "futures", "itertools", - "kvdb", - "kvdb-memorydb", + "kvdb 0.13.0", + "kvdb-memorydb 0.13.0", "kvdb-shared-tests", "lazy_static", "log", @@ -7091,8 +7124,8 @@ dependencies = [ "hex-literal", "kusama-runtime", "kusama-runtime-constants", - "kvdb", - "kvdb-rocksdb", + "kvdb 0.13.0", + "kvdb-rocksdb 0.17.0", "log", "lru", "mmr-gadget", @@ -8525,9 +8558,9 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#9ce75afde9ada98a69e4ab3abbbfb7fa8202d72b" dependencies = [ "hash-db", - "kvdb", - "kvdb-memorydb", - "kvdb-rocksdb", + "kvdb 0.12.0", + "kvdb-memorydb 0.12.0", + "kvdb-rocksdb 0.16.0", "linked-hash-map", "log", "parity-db", @@ -10120,7 +10153,7 @@ name = "sp-database" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#9ce75afde9ada98a69e4ab3abbbfb7fa8202d72b" dependencies = [ - "kvdb", + "kvdb 0.12.0", "parking_lot 0.12.1", ] diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml index bf580c3bf348..5fdba032541f 100644 --- a/node/core/approval-voting/Cargo.toml +++ b/node/core/approval-voting/Cargo.toml @@ -13,7 +13,7 @@ bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } lru = "0.8" merlin = "2.0" schnorrkel = "0.9.1" -kvdb = "0.12.0" +kvdb = "0.13.0" derive_more = "0.99.17" thiserror = "1.0.31" @@ -40,5 +40,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.12.0" +kvdb-memorydb = "0.13.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 a4a39df77668..0254eccaf8b9 100644 --- a/node/core/av-store/Cargo.toml +++ b/node/core/av-store/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] futures = "0.3.21" futures-timer = "3.0.2" -kvdb = "0.12.0" +kvdb = "0.13.0" thiserror = "1.0.31" gum = { package = "tracing-gum", path = "../../gum" } bitvec = "1.0.0" @@ -24,7 +24,7 @@ polkadot-node-primitives = { path = "../../primitives" } log = "0.4.17" env_logger = "0.9.0" assert_matches = "1.4.0" -kvdb-memorydb = "0.12.0" +kvdb-memorydb = "0.13.0" sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml index 1e505a4df98d..8f6b3ea0809a 100644 --- a/node/core/chain-selection/Cargo.toml +++ b/node/core/chain-selection/Cargo.toml @@ -13,7 +13,7 @@ polkadot-primitives = { path = "../../../primitives" } polkadot-node-primitives = { path = "../../primitives" } polkadot-node-subsystem = { path = "../../subsystem" } polkadot-node-subsystem-util = { path = "../../subsystem-util" } -kvdb = "0.12.0" +kvdb = "0.13.0" thiserror = "1.0.31" parity-scale-codec = "3.1.5" @@ -22,4 +22,4 @@ polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } parking_lot = "0.12.0" assert_matches = "1" -kvdb-memorydb = "0.12.0" +kvdb-memorydb = "0.13.0" diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml index 19eff42d4ad3..90acb3e82644 100644 --- a/node/core/dispute-coordinator/Cargo.toml +++ b/node/core/dispute-coordinator/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" futures = "0.3.21" gum = { package = "tracing-gum", path = "../../gum" } parity-scale-codec = "3.1.5" -kvdb = "0.12.0" +kvdb = "0.13.0" thiserror = "1.0.31" lru = "0.8.0" fatality = "0.0.6" @@ -22,7 +22,7 @@ sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste [dev-dependencies] -kvdb-memorydb = "0.12.0" +kvdb-memorydb = "0.13.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/service/Cargo.toml b/node/service/Cargo.toml index 007e9deb19da..cea8993cf5e5 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -71,8 +71,8 @@ gum = { package = "tracing-gum", path = "../gum/" } serde = { version = "1.0.137", features = ["derive"] } serde_json = "1.0.81" thiserror = "1.0.31" -kvdb = "0.12.0" -kvdb-rocksdb = { version = "0.16.0", optional = true } +kvdb = "0.13.0" +kvdb-rocksdb = { version = "0.17.0", optional = true } parity-db = { version = "0.4.2", optional = true } async-trait = "0.1.57" diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml index 45465e44bad7..ed39378a9d95 100644 --- a/node/subsystem-util/Cargo.toml +++ b/node/subsystem-util/Cargo.toml @@ -32,7 +32,7 @@ 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" } -kvdb = "0.12.0" +kvdb = "0.13.0" parity-db = { version = "0.4.2"} [dev-dependencies] @@ -45,4 +45,4 @@ lazy_static = "1.4.0" polkadot-primitives-test-helpers = { path = "../../primitives/test-helpers" } kvdb-shared-tests = "0.10.0" tempfile = "3.1.0" -kvdb-memorydb = "0.12.0" +kvdb-memorydb = "0.13.0" diff --git a/parachain/src/primitives.rs b/parachain/src/primitives.rs index f9fa9be0af31..e638b83c2d7c 100644 --- a/parachain/src/primitives.rs +++ b/parachain/src/primitives.rs @@ -130,10 +130,7 @@ pub struct BlockData(#[cfg_attr(feature = "std", serde(with = "bytes"))] pub Vec RuntimeDebug, TypeInfo, )] -#[cfg_attr( - feature = "std", - derive(serde::Serialize, serde::Deserialize, derive_more::Display) -)] +#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize, derive_more::Display))] pub struct Id(u32); impl TypeId for Id { From 7f06ad30a616d1865843beaf91478f11d5566559 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 1 Dec 2022 09:57:13 -0500 Subject: [PATCH 3/8] Remove `trie-memory-tracker` feature --- cli/Cargo.toml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 13739d396b24..e1bd2679dddc 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -35,15 +35,11 @@ polkadot-node-metrics = { path = "../node/metrics" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "master" } -# this crate is used only to enable `trie-memory-tracker` feature -# see https://github.com/paritytech/substrate/pull/6745 -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } - [build-dependencies] substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] -default = ["db", "cli", "hostperfcheck", "full-node", "trie-memory-tracker", "polkadot-native"] +default = ["db", "cli", "hostperfcheck", "full-node", "polkadot-native"] db = ["service/db"] cli = [ "clap", @@ -60,7 +56,6 @@ runtime-benchmarks = [ "polkadot-node-metrics/runtime-benchmarks", "polkadot-performance-test?/runtime-benchmarks" ] -trie-memory-tracker = ["sp-trie/memory-tracker"] full-node = ["service/full-node"] try-runtime = ["service/try-runtime", "try-runtime-cli/try-runtime"] fast-runtime = ["service/fast-runtime"] From fa00f585193568312c87099b389e784f0211e93f Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 1 Dec 2022 10:00:57 -0500 Subject: [PATCH 4/8] Update Cargo.lock --- Cargo.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index fc3b3586aa59..a0e97d7ef4a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6074,7 +6074,6 @@ dependencies = [ "sc-tracing", "sp-core", "sp-keyring", - "sp-trie", "substrate-build-script-utils", "thiserror", "try-runtime-cli", From 323a85860e6d6b17052430bc8d32a0412a993be4 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 1 Dec 2022 10:09:04 -0500 Subject: [PATCH 5/8] Update `kvdb-shared-tests` --- Cargo.lock | 6 +++--- node/subsystem-util/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a0e97d7ef4a8..6145664a5086 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3413,11 +3413,11 @@ dependencies = [ [[package]] name = "kvdb-shared-tests" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de82a1adb7ade192c0090dd56d059a626191c0638c795eb68aff4b0bd2c1f9be" +checksum = "64d3b4e3e80c369f1b5364b6acdeba9b8a02285e91a5570f7c0404b7f9024541" dependencies = [ - "kvdb 0.12.0", + "kvdb 0.13.0", ] [[package]] diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml index 8a39a2a037ea..4db70b5ea15f 100644 --- a/node/subsystem-util/Cargo.toml +++ b/node/subsystem-util/Cargo.toml @@ -43,6 +43,6 @@ log = "0.4.17" polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" } lazy_static = "1.4.0" polkadot-primitives-test-helpers = { path = "../../primitives/test-helpers" } -kvdb-shared-tests = "0.10.0" +kvdb-shared-tests = "0.11.0" tempfile = "3.1.0" kvdb-memorydb = "0.13.0" From 0b17abce19eafa75d40f66c4cca30f4f9467708c Mon Sep 17 00:00:00 2001 From: Marcin S Date: Thu, 1 Dec 2022 11:12:13 -0500 Subject: [PATCH 6/8] Add back jemalloc --- Cargo.lock | 23 +++++++++++++++++++ Cargo.toml | 1 + node/overseer/Cargo.toml | 1 + node/overseer/src/lib.rs | 30 +++++++++++++++++++++++++ node/overseer/src/memory_stats.rs | 37 +++++++++++++++++++++++++++++++ node/overseer/src/metrics.rs | 9 ++++++++ src/main.rs | 4 ++++ 7 files changed, 105 insertions(+) create mode 100644 node/overseer/src/memory_stats.rs diff --git a/Cargo.lock b/Cargo.lock index 6145664a5086..a13ccb4b110f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5944,6 +5944,7 @@ dependencies = [ "polkadot-core-primitives", "substrate-rpc-client", "tempfile", + "tikv-jemallocator", "tokio", ] @@ -6797,6 +6798,7 @@ dependencies = [ "sc-client-api", "sp-api", "sp-core", + "tikv-jemalloc-ctl", "tracing-gum", ] @@ -11238,6 +11240,17 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + [[package]] name = "tikv-jemalloc-sys" version = "0.5.2+5.3.0-patched" @@ -11249,6 +11262,16 @@ dependencies = [ "libc", ] +[[package]] +name = "tikv-jemallocator" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + [[package]] name = "time" version = "0.1.44" diff --git a/Cargo.toml b/Cargo.toml index 3cb7e1d0e597..06a7d017a2fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,7 @@ readme = "README.md" [dependencies] polkadot-cli = { path = "cli", features = [ "kusama-native", "westend-native", "rococo-native" ] } color-eyre = { version = "0.6.1", default-features = false } +tikv-jemallocator = "0.5.0" [dev-dependencies] assert_cmd = "2.0.4" diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 627eba65ea8c..5fe65aa5061f 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -20,6 +20,7 @@ gum = { package = "tracing-gum", path = "../gum" } lru = "0.8" sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } async-trait = "0.1.57" +tikv-jemalloc-ctl = "0.5.0" [dev-dependencies] metered = { package = "prioritized-metered-channel", version = "0.2.0" } diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index dd2a08551931..78d1e1fe7889 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -116,11 +116,14 @@ pub const KNOWN_LEAVES_CACHE_SIZE: NonZeroUsize = match NonZeroUsize::new(2 * 24 None => panic!("Known leaves cache size must be non-zero"), }; +mod memory_stats; #[cfg(test)] mod tests; use sp_core::traits::SpawnNamed; +use memory_stats::MemoryAllocationTracker; + /// Glue to connect `trait orchestra::Spawner` and `SpawnNamed` from `substrate`. pub struct SpawnGlue(pub S); @@ -649,7 +652,34 @@ where } let subsystem_meters = overseer.map_subsystems(ExtractNameAndMeters); + let collect_memory_stats: Box = + match MemoryAllocationTracker::new() { + Ok(memory_stats) => + Box::new(move |metrics: &OverseerMetrics| match memory_stats.snapshot() { + Ok(memory_stats_snapshot) => { + gum::trace!( + target: LOG_TARGET, + "memory_stats: {:?}", + &memory_stats_snapshot + ); + metrics.memory_stats_snapshot(memory_stats_snapshot); + }, + Err(e) => + gum::debug!(target: LOG_TARGET, "Failed to obtain memory stats: {:?}", e), + }), + Err(_) => { + gum::debug!( + target: LOG_TARGET, + "Memory allocation tracking is not supported by the allocator.", + ); + + Box::new(|_| {}) + }, + }; + let metronome = Metronome::new(std::time::Duration::from_millis(950)).for_each(move |_| { + collect_memory_stats(&metronome_metrics); + // We combine the amount of messages from subsystems to the overseer // as well as the amount of messages from external sources to the overseer // into one `to_overseer` value. diff --git a/node/overseer/src/memory_stats.rs b/node/overseer/src/memory_stats.rs new file mode 100644 index 000000000000..3f2157436df1 --- /dev/null +++ b/node/overseer/src/memory_stats.rs @@ -0,0 +1,37 @@ +use tikv_jemalloc_ctl::{epoch, stats, Error}; + +#[derive(Clone)] +pub struct MemoryAllocationTracker { + epoch: tikv_jemalloc_ctl::epoch_mib, + allocated: stats::allocated_mib, + resident: stats::resident_mib, +} + +impl MemoryAllocationTracker { + pub fn new() -> Result { + Ok(Self { + epoch: epoch::mib()?, + allocated: stats::allocated::mib()?, + resident: stats::resident::mib()?, + }) + } + + pub fn snapshot(&self) -> Result { + // update stats by advancing the allocation epoch + self.epoch.advance()?; + + let allocated: u64 = self.allocated.read()? as _; + let resident: u64 = self.resident.read()? as _; + Ok(MemoryAllocationSnapshot { allocated, resident }) + } +} + +/// Snapshot of collected memory metrics. +#[non_exhaustive] +#[derive(Debug, Clone)] +pub struct MemoryAllocationSnapshot { + /// Total resident memory, in bytes. + pub resident: u64, + /// Total allocated memory, in bytes. + pub allocated: u64, +} diff --git a/node/overseer/src/metrics.rs b/node/overseer/src/metrics.rs index 4ac9b3b5fdca..bb7d98a68f2e 100644 --- a/node/overseer/src/metrics.rs +++ b/node/overseer/src/metrics.rs @@ -19,6 +19,8 @@ use super::*; pub use polkadot_node_metrics::metrics::{self, prometheus, Metrics as MetricsTrait}; +use memory_stats::MemoryAllocationSnapshot; + /// Overseer Prometheus metrics. #[derive(Clone)] struct MetricsInner { @@ -65,6 +67,13 @@ impl Metrics { } } + pub(crate) fn memory_stats_snapshot(&self, memory_stats: MemoryAllocationSnapshot) { + if let Some(metrics) = &self.0 { + metrics.memory_stats_allocated.set(memory_stats.allocated); + metrics.memory_stats_resident.set(memory_stats.resident); + } + } + pub(crate) fn channel_metrics_snapshot( &self, collection: impl IntoIterator, diff --git a/src/main.rs b/src/main.rs index 14d62fbb9ad6..4347aa0184d4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,6 +20,10 @@ use color_eyre::eyre; +/// Global allocator +#[global_allocator] +pub static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; + fn main() -> eyre::Result<()> { color_eyre::install()?; polkadot_cli::run()?; From 85c14beb0f219243da3df9c769a928f123cf1325 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Mon, 5 Dec 2022 06:08:09 -0500 Subject: [PATCH 7/8] Add missing license header --- node/overseer/src/memory_stats.rs | 16 ++++++++++++++++ src/main.rs | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/node/overseer/src/memory_stats.rs b/node/overseer/src/memory_stats.rs index 3f2157436df1..670762a4935c 100644 --- a/node/overseer/src/memory_stats.rs +++ b/node/overseer/src/memory_stats.rs @@ -1,3 +1,19 @@ +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. + +// Polkadot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Polkadot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . + use tikv_jemalloc_ctl::{epoch, stats, Error}; #[derive(Clone)] diff --git a/src/main.rs b/src/main.rs index 4347aa0184d4..13c17df851f1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,7 +20,8 @@ use color_eyre::eyre; -/// Global allocator +/// Global allocator. Changing it to another allocator will require changing +/// `memory_stats::MemoryAllocationTracker`. #[global_allocator] pub static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; From ed1074f10a67f41f5e2ef945960074a60d5066f0 Mon Sep 17 00:00:00 2001 From: parity-processbot <> Date: Tue, 6 Dec 2022 14:57:49 +0000 Subject: [PATCH 8/8] update lockfile for {"substrate"} --- Cargo.lock | 477 +++++++++++++++++++++++------------------------------ 1 file changed, 203 insertions(+), 274 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b4e256650dc8..7e5855354730 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "async-trait", @@ -447,7 +447,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "beefy-gadget", "futures", @@ -467,7 +467,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "sp-api", "sp-beefy", @@ -1990,7 +1990,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", ] @@ -2014,7 +2014,7 @@ checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -2037,7 +2037,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "Inflector", "array-bytes", @@ -2051,7 +2051,7 @@ dependencies = [ "handlebars", "hash-db", "itertools", - "kvdb 0.12.0", + "kvdb", "lazy_static", "linked-hash-map", "log", @@ -2089,7 +2089,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2100,7 +2100,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2116,7 +2116,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -2145,7 +2145,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "env_logger 0.9.0", "log", @@ -2162,7 +2162,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "bitflags", "frame-metadata", @@ -2194,7 +2194,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "Inflector", "cfg-expr", @@ -2208,7 +2208,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2220,7 +2220,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "proc-macro2", "quote", @@ -2230,7 +2230,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2253,7 +2253,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "log", @@ -2282,7 +2282,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -2297,7 +2297,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "sp-api", @@ -2306,7 +2306,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "parity-scale-codec", @@ -2477,7 +2477,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "chrono", "frame-election-provider-support", @@ -3325,16 +3325,6 @@ dependencies = [ "log", ] -[[package]] -name = "kvdb" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" -dependencies = [ - "parity-util-mem", - "smallvec", -] - [[package]] name = "kvdb" version = "0.13.0" @@ -3344,50 +3334,23 @@ dependencies = [ "smallvec", ] -[[package]] -name = "kvdb-memorydb" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" -dependencies = [ - "kvdb 0.12.0", - "parity-util-mem", - "parking_lot 0.12.1", -] - [[package]] name = "kvdb-memorydb" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ - "kvdb 0.13.0", + "kvdb", "parking_lot 0.12.1", ] -[[package]] -name = "kvdb-rocksdb" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" -dependencies = [ - "kvdb 0.12.0", - "log", - "num_cpus", - "parity-util-mem", - "parking_lot 0.12.1", - "regex", - "rocksdb", - "smallvec", -] - [[package]] name = "kvdb-rocksdb" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" dependencies = [ - "kvdb 0.13.0", + "kvdb", "num_cpus", "parking_lot 0.12.1", "regex", @@ -3401,7 +3364,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d3b4e3e80c369f1b5364b6acdeba9b8a02285e91a5570f7c0404b7f9024541" dependencies = [ - "kvdb 0.13.0", + "kvdb", ] [[package]] @@ -4044,13 +4007,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" +checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" dependencies = [ "hash-db", "hashbrown", - "parity-util-mem", ] [[package]] @@ -4119,7 +4081,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "log", @@ -4139,7 +4101,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "anyhow", "jsonrpsee", @@ -4644,7 +4606,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4658,7 +4620,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -4674,7 +4636,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -4689,7 +4651,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4713,7 +4675,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4733,7 +4695,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -4752,7 +4714,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4767,7 +4729,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -4783,7 +4745,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "beefy-merkle-tree", @@ -4806,7 +4768,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4824,7 +4786,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4843,7 +4805,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4860,7 +4822,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "assert_matches", "frame-benchmarking", @@ -4877,7 +4839,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4895,7 +4857,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4919,7 +4881,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4932,7 +4894,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4950,7 +4912,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4968,7 +4930,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4991,7 +4953,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5007,7 +4969,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5027,7 +4989,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5044,7 +5006,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5061,7 +5023,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5078,7 +5040,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5094,7 +5056,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5110,7 +5072,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -5127,7 +5089,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5147,7 +5109,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "sp-api", @@ -5157,7 +5119,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -5174,7 +5136,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5197,7 +5159,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5214,7 +5176,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5229,7 +5191,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5247,7 +5209,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5262,7 +5224,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5280,7 +5242,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5296,7 +5258,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -5317,7 +5279,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5333,7 +5295,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -5347,7 +5309,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5370,7 +5332,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5381,7 +5343,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "log", "sp-arithmetic", @@ -5390,7 +5352,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5407,7 +5369,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -5421,7 +5383,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5439,7 +5401,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5458,7 +5420,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-support", "frame-system", @@ -5474,7 +5436,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5490,7 +5452,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5502,7 +5464,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5519,7 +5481,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5535,7 +5497,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5550,7 +5512,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5661,33 +5623,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-util-mem" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" -dependencies = [ - "cfg-if", - "hashbrown", - "impl-trait-for-tuples", - "parity-util-mem-derive", - "parking_lot 0.12.1", - "primitive-types", - "smallvec", - "winapi", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2", - "syn", - "synstructure", -] - [[package]] name = "parity-wasm" version = "0.45.0" @@ -6258,8 +6193,8 @@ dependencies = [ "derive_more", "futures", "futures-timer", - "kvdb 0.13.0", - "kvdb-memorydb 0.13.0", + "kvdb", + "kvdb-memorydb", "lru", "merlin", "parity-scale-codec", @@ -6296,8 +6231,8 @@ dependencies = [ "env_logger 0.9.0", "futures", "futures-timer", - "kvdb 0.13.0", - "kvdb-memorydb 0.13.0", + "kvdb", + "kvdb-memorydb", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -6406,8 +6341,8 @@ dependencies = [ "assert_matches", "futures", "futures-timer", - "kvdb 0.13.0", - "kvdb-memorydb 0.13.0", + "kvdb", + "kvdb-memorydb", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", @@ -6428,8 +6363,8 @@ dependencies = [ "fatality", "futures", "futures-timer", - "kvdb 0.13.0", - "kvdb-memorydb 0.13.0", + "kvdb", + "kvdb-memorydb", "lru", "parity-scale-codec", "polkadot-node-primitives", @@ -6714,8 +6649,8 @@ dependencies = [ "fatality", "futures", "itertools", - "kvdb 0.13.0", - "kvdb-memorydb 0.13.0", + "kvdb", + "kvdb-memorydb", "kvdb-shared-tests", "lazy_static", "log", @@ -7102,8 +7037,8 @@ dependencies = [ "hex-literal", "kusama-runtime", "kusama-runtime-constants", - "kvdb 0.13.0", - "kvdb-rocksdb 0.17.0", + "kvdb", + "kvdb-rocksdb", "log", "lru", "mmr-gadget", @@ -8344,7 +8279,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "log", "sp-core", @@ -8355,7 +8290,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "futures", @@ -8382,7 +8317,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "futures-timer", @@ -8405,7 +8340,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8421,7 +8356,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "impl-trait-for-tuples", "memmap2", @@ -8438,7 +8373,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8449,7 +8384,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "chrono", @@ -8489,7 +8424,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "fnv", "futures", @@ -8517,12 +8452,12 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "hash-db", - "kvdb 0.12.0", - "kvdb-memorydb 0.12.0", - "kvdb-rocksdb 0.16.0", + "kvdb", + "kvdb-memorydb", + "kvdb-rocksdb", "linked-hash-map", "log", "parity-db", @@ -8542,7 +8477,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "futures", @@ -8566,7 +8501,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "fork-tree", @@ -8607,7 +8542,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "jsonrpsee", @@ -8629,7 +8564,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8642,7 +8577,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "futures", @@ -8666,7 +8601,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "lazy_static", "lru", @@ -8692,7 +8627,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "environmental", "parity-scale-codec", @@ -8708,7 +8643,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "log", "parity-scale-codec", @@ -8723,7 +8658,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "cfg-if", "libc", @@ -8743,7 +8678,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "ahash", "array-bytes", @@ -8784,7 +8719,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "finality-grandpa", "futures", @@ -8805,13 +8740,12 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "ansi_term", "futures", "futures-timer", "log", - "parity-util-mem", "sc-client-api", "sc-network-common", "sc-transaction-pool-api", @@ -8822,7 +8756,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "async-trait", @@ -8837,7 +8771,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "async-trait", @@ -8884,7 +8818,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "cid", "futures", @@ -8904,7 +8838,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "bitflags", @@ -8930,7 +8864,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "ahash", "futures", @@ -8948,7 +8882,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "futures", @@ -8969,7 +8903,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "async-trait", @@ -9000,7 +8934,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "futures", @@ -9019,7 +8953,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "bytes", @@ -9049,7 +8983,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "libp2p", @@ -9062,7 +8996,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9071,7 +9005,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "hash-db", @@ -9101,7 +9035,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "jsonrpsee", @@ -9124,7 +9058,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "jsonrpsee", @@ -9137,7 +9071,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "hex", @@ -9156,7 +9090,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "directories", @@ -9167,7 +9101,6 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "pin-project", "rand 0.7.3", @@ -9227,12 +9160,10 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "log", "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", "parking_lot 0.12.1", "sc-client-api", "sp-core", @@ -9241,7 +9172,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9260,7 +9191,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "libc", @@ -9279,7 +9210,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "chrono", "futures", @@ -9297,7 +9228,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "ansi_term", "atty", @@ -9328,7 +9259,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9339,7 +9270,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "futures", @@ -9347,7 +9278,6 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", @@ -9366,7 +9296,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "futures", @@ -9380,7 +9310,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "futures-timer", @@ -9861,7 +9791,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "hash-db", "log", @@ -9879,7 +9809,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "blake2", "proc-macro-crate", @@ -9891,7 +9821,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "scale-info", @@ -9904,7 +9834,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "integer-sqrt", "num-traits", @@ -9919,7 +9849,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "scale-info", @@ -9932,7 +9862,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "parity-scale-codec", @@ -9944,7 +9874,7 @@ dependencies = [ [[package]] name = "sp-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "scale-info", @@ -9961,7 +9891,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "sp-api", @@ -9973,7 +9903,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "log", @@ -9991,7 +9921,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "futures", @@ -10010,7 +9940,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "merlin", @@ -10033,7 +9963,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "scale-info", @@ -10047,7 +9977,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "scale-info", @@ -10060,7 +9990,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "base58", @@ -10105,7 +10035,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "blake2", "byteorder", @@ -10119,7 +10049,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "proc-macro2", "quote", @@ -10130,16 +10060,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ - "kvdb 0.12.0", + "kvdb", "parking_lot 0.12.1", ] [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "proc-macro2", "quote", @@ -10149,7 +10079,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "environmental", "parity-scale-codec", @@ -10160,7 +10090,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "finality-grandpa", "log", @@ -10178,7 +10108,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10192,7 +10122,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "bytes", "ed25519-dalek", @@ -10219,7 +10149,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "lazy_static", "sp-core", @@ -10230,7 +10160,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "futures", @@ -10247,7 +10177,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "thiserror", "zstd", @@ -10256,7 +10186,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -10274,7 +10204,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "scale-info", @@ -10288,7 +10218,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "sp-api", "sp-core", @@ -10298,7 +10228,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "backtrace", "lazy_static", @@ -10308,7 +10238,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "rustc-hash", "serde", @@ -10318,14 +10248,13 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", "rand 0.7.3", "scale-info", @@ -10341,7 +10270,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10359,7 +10288,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "Inflector", "proc-macro-crate", @@ -10371,7 +10300,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "log", "parity-scale-codec", @@ -10385,7 +10314,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "scale-info", @@ -10399,7 +10328,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "scale-info", @@ -10410,7 +10339,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "hash-db", "log", @@ -10432,12 +10361,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10450,7 +10379,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "futures-timer", @@ -10466,7 +10395,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "sp-std", @@ -10478,7 +10407,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "sp-api", "sp-runtime", @@ -10487,7 +10416,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "log", @@ -10503,7 +10432,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "ahash", "hash-db", @@ -10526,7 +10455,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10543,7 +10472,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10554,7 +10483,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "impl-trait-for-tuples", "log", @@ -10567,7 +10496,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10782,7 +10711,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "platforms", ] @@ -10790,7 +10719,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -10811,7 +10740,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures-util", "hyper", @@ -10824,7 +10753,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "async-trait", "jsonrpsee", @@ -10837,7 +10766,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "jsonrpsee", "log", @@ -10858,7 +10787,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "array-bytes", "async-trait", @@ -10884,7 +10813,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "futures", "substrate-test-utils-derive", @@ -10894,7 +10823,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10905,7 +10834,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "ansi_term", "build-helper", @@ -11614,7 +11543,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5" +source = "git+https://github.com/paritytech/substrate?branch=master#fafc8e0ba8c98bd22b47913ded414e74a0fcb67f" dependencies = [ "clap", "frame-remote-externalities",