Merge branch 'master' into ao-lower-collator-inactivity-period

* master: Set CurrentCodeHash before running some dispatchable benchmarks (#4645) paras: split tests (#4636) Bump quote from 1.0.10 to 1.0.14 (#4632) Bump pin-project from 1.0.8 to 1.0.9 (#4606) chore: fix copy&paste and tidy comments (#4646) derive Copy and Clone for Upgrade signals (#4637) (#4647) paras: fix upgrade restriction signal (#4603) configuration: Rename validation_upgrade_{frequency -> cooldown} (#4635) Bump lru from 0.7.1 to 0.7.2 (#4633) paras: add governance control dispatchables (#4575)
paritytech · Jan 3, 2022 · 048e7c3 · 048e7c3
2 parents 503e467 + 2f4b417
commit 048e7c3
Show file tree

Hide file tree

Showing 32 changed files with 1,809 additions and 1,419 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml
@@ -10,7 +10,7 @@ tracing = "0.1.29"
 parity-scale-codec = "2"
 kvdb = "0.10.0"
 thiserror = "1.0.30"
-lru = "0.7.1"
+lru = "0.7.2"
 
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }

diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
@@ -17,7 +17,7 @@ futures = "0.3.19"
 futures-timer = "3.0.2"
 slotmap = "1.0"
 tracing = "0.1.29"
-pin-project = "1.0.8"
+pin-project = "1.0.9"
 rand = "0.8.3"
 parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] }
 polkadot-parachain = { path = "../../../parachain" }

diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml
@@ -19,7 +19,7 @@ sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste
 thiserror = "1.0.30"
 rand = "0.8.3"
 derive_more = "0.99.17"
-lru = "0.7.1"
+lru = "0.7.2"
 
 [dev-dependencies]
 polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }

diff --git a/node/network/availability-recovery/Cargo.toml b/node/network/availability-recovery/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.19"
-lru = "0.7.1"
+lru = "0.7.2"
 rand = "0.8.3"
 thiserror = "1.0.30"
 tracing = "0.1.29"

diff --git a/node/network/dispute-distribution/Cargo.toml b/node/network/dispute-distribution/Cargo.toml
@@ -19,7 +19,7 @@ sc-network = { 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" }
 thiserror = "1.0.30"
-lru = "0.7.1"
+lru = "0.7.2"
 
 [dev-dependencies]
 async-trait = "0.1.52"

diff --git a/node/overseer/overseer-gen/proc-macro/Cargo.toml b/node/overseer/overseer-gen/proc-macro/Cargo.toml
@@ -13,7 +13,7 @@ proc-macro = true
 
 [dependencies]
 syn = { version = "1.0.83", features = ["full", "extra-traits"] }
-quote = "1.0.10"
+quote = "1.0.14"
 proc-macro2 = "1.0.36"
 proc-macro-crate = "1.1.0"
 

diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs
@@ -179,7 +179,7 @@ fn default_parachains_host_configuration(
 	use polkadot_primitives::v1::{MAX_CODE_SIZE, MAX_POV_SIZE};
 
 	polkadot_runtime_parachains::configuration::HostConfiguration {
-		validation_upgrade_frequency: 2u32,
+		validation_upgrade_cooldown: 2u32,
 		validation_upgrade_delay: 2,
 		code_retention_period: 1200,
 		max_code_size: MAX_CODE_SIZE,

diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml
@@ -10,12 +10,12 @@ async-trait = "0.1.52"
 futures = "0.3.19"
 itertools = "0.10"
 parity-scale-codec = { version = "2.3.1", default-features = false, features = ["derive"] }
-pin-project = "1.0.8"
+pin-project = "1.0.9"
 rand = "0.8.3"
 thiserror = "1.0.30"
 tracing = "0.1.29"
 derive_more = "0.99.17"
-lru = "0.7.1"
+lru = "0.7.2"
 
 polkadot-node-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" }
 polkadot-node-jaeger = { path = "../jaeger" }

diff --git a/node/test/performance-test/Cargo.toml b/node/test/performance-test/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 thiserror = "1.0.30"
-quote = "1.0.10"
+quote = "1.0.14"
 env_logger = "0.9"
 log = "0.4"