Merge remote-tracking branch 'origin/master' into bernhard-dispute-me…

…trics
paritytech · Sep 15, 2021 · a911304 · a911304
2 parents 4f753bf + 7e7506e
commit a911304
Show file tree

Hide file tree

Showing 49 changed files with 997 additions and 253 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 polkadot-erasure-coding = { path = "../../erasure-coding" }
 polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-subsystem = { path = "../subsystem" }

diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 futures = "0.3.17"
 futures-timer = "3.0.2"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
-tracing = "0.1.26"
+tracing = "0.1.27"
 bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
 lru = "0.6"
 merlin = "2.0"

diff --git a/node/core/approval-voting/src/lib.rs b/node/core/approval-voting/src/lib.rs
@@ -1063,7 +1063,7 @@ async fn handle_from_overseer(
 					Ok(block_imported_candidates) => {
 						// Schedule wakeups for all imported candidates.
 						for block_batch in block_imported_candidates {
-							tracing::debug!(
+							tracing::trace!(
 								target: LOG_TARGET,
 								block_hash = ?block_batch.block_hash,
 								num_candidates = block_batch.imported_candidates.len(),
@@ -2410,7 +2410,7 @@ async fn issue_approval(
 	)
 	.expect("Statement just signed; should pass checks; qed");
 
-	tracing::debug!(
+	tracing::trace!(
 		target: LOG_TARGET,
 		?candidate_hash,
 		?block_hash,

diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml
@@ -9,7 +9,7 @@ futures = "0.3.17"
 futures-timer = "3.0.2"
 kvdb = "0.10.0"
 thiserror = "1.0.26"
-tracing = "0.1.26"
+tracing = "0.1.27"
 bitvec = "0.20.1"
 
 parity-scale-codec = { version = "2.0.0", features = ["derive"] }

diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
@@ -14,7 +14,7 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 erasure-coding = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" }
 statement-table = { package = "polkadot-statement-table", path = "../../../statement-table" }
 bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
-tracing = "0.1.26"
+tracing = "0.1.27"
 thiserror = "1.0.26"
 
 [dev-dependencies]

diff --git a/node/core/bitfield-signing/Cargo.toml b/node/core/bitfield-signing/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }

diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 async-trait = "0.1.51"
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 
 sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "master" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }

diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }

diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 [dependencies]
 futures = "0.3.17"
 futures-timer = "3"
-tracing = "0.1.26"
+tracing = "0.1.27"
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }

diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 parity-scale-codec = "2"
 kvdb = "0.10.0"
 derive_more = "0.99.14"

diff --git a/node/core/dispute-participation/Cargo.toml b/node/core/dispute-participation/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 futures = "0.3.17"
 thiserror = "1.0.26"
-tracing = "0.1.26"
+tracing = "0.1.27"
 
 polkadot-node-primitives = { path = "../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }

diff --git a/node/core/parachains-inherent/Cargo.toml b/node/core/parachains-inherent/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 futures = "0.3.17"
 futures-timer = "3.0.2"
-tracing = "0.1.26"
+tracing = "0.1.27"
 thiserror = "1.0.26"
 async-trait = "0.1.51"
 polkadot-node-subsystem = { path = "../../subsystem" }

diff --git a/node/core/provisioner/Cargo.toml b/node/core/provisioner/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 thiserror = "1.0.26"
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-node-subsystem = { path = "../../subsystem" }

diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
@@ -17,7 +17,7 @@ futures = "0.3.17"
 futures-timer = "3.0.2"
 libc = "0.2.101"
 slotmap = "1.0"
-tracing = "0.1.26"
+tracing = "0.1.27"
 pin-project = "1.0.8"
 rand = "0.8.3"
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }

diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 memory-lru = "0.1.0"
 parity-util-mem = { version = "0.10.0", default-features = false }
 

diff --git a/node/network/approval-distribution/Cargo.toml b/node/network/approval-distribution/Cargo.toml
@@ -12,7 +12,7 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-primitives = { path = "../../../primitives" }
 
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 
 [dev-dependencies]
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }

diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 parity-scale-codec = { version = "2.0.0", features = ["std"] }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-erasure-coding = { path = "../../../erasure-coding" }

diff --git a/node/network/availability-recovery/Cargo.toml b/node/network/availability-recovery/Cargo.toml
@@ -9,7 +9,7 @@ futures = "0.3.17"
 lru = "0.6.6"
 rand = "0.8.3"
 thiserror = "1.0.26"
-tracing = "0.1.26"
+tracing = "0.1.27"
 
 polkadot-erasure-coding = { path = "../../../erasure-coding" }
 polkadot-primitives = { path = "../../../primitives" }

diff --git a/node/network/bitfield-distribution/Cargo.toml b/node/network/bitfield-distribution/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }

diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 async-trait = "0.1.51"
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 polkadot-primitives = { path = "../../../primitives" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml
@@ -10,7 +10,7 @@ derive_more = "0.99.14"
 futures = "0.3.17"
 futures-timer = "3"
 thiserror = "1.0.26"
-tracing = "0.1.26"
+tracing = "0.1.27"
 
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/node/network/dispute-distribution/Cargo.toml b/node/network/dispute-distribution/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 derive_more = "0.99.14"
 parity-scale-codec = { version = "2.0.0", features = ["std"] }
 polkadot-primitives = { path = "../../../primitives" }

diff --git a/node/network/gossip-support/Cargo.toml b/node/network/gossip-support/Cargo.toml
@@ -17,7 +17,7 @@ polkadot-primitives = { path = "../../../primitives" }
 futures = "0.3.17"
 rand = { version = "0.8.3", default-features = false }
 rand_chacha = { version = "0.3.1", default-features = false }
-tracing = "0.1.26"
+tracing = "0.1.27"
 
 [dev-dependencies]
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/node/network/gossip-support/src/lib.rs b/node/network/gossip-support/src/lib.rs
@@ -54,7 +54,6 @@ const BACKOFF_DURATION: Duration = Duration::from_secs(5);
 /// should be fine:
 ///
 /// https://github.com/paritytech/substrate/blob/fc49802f263529160635471c8a17888846035f5d/client/authority-discovery/src/lib.rs#L88
-///
 const LOW_CONNECTIVITY_WARN_DELAY: Duration = Duration::from_secs(600);
 
 /// The Gossip Support subsystem.

diff --git a/node/network/protocol/src/request_response/outgoing.rs b/node/network/protocol/src/request_response/outgoing.rs
@@ -82,11 +82,11 @@ pub type ResponseSender = oneshot::Sender<Result<Vec<u8>, network::RequestFailur
 #[derive(Debug, Error)]
 pub enum RequestError {
 	/// Response could not be decoded.
-	#[error("Response could not be decoded")]
+	#[error("Response could not be decoded: {0}")]
 	InvalidResponse(#[source] DecodingError),
 
 	/// Some error in substrate/libp2p happened.
-	#[error("Some network error occurred")]
+	#[error("{0}")]
 	NetworkError(#[source] network::RequestFailure),
 
 	/// Response got canceled by networking.

diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.17"
-tracing = "0.1.26"
+tracing = "0.1.27"
 polkadot-primitives = { path = "../../../primitives" }
 sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml
@@ -17,7 +17,7 @@ polkadot-node-metrics = { path = "../metrics" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-overseer-gen = { path = "./overseer-gen" }
 polkadot-overseer-all-subsystems-gen = { path = "./all-subsystems-gen" }
-tracing = "0.1.26"
+tracing = "0.1.27"
 lru = "0.6"
 
 [dev-dependencies]

diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
@@ -62,7 +62,7 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https:
 # External Crates
 futures = "0.3.17"
 hex-literal = "0.3.3"
-tracing = "0.1.26"
+tracing = "0.1.27"
 serde = { version = "1.0.130", features = ["derive"] }
 thiserror = "1.0.26"
 kvdb = "0.10.0"

diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs
@@ -185,7 +185,6 @@ fn default_parachains_host_configuration(
 		ump_service_total_weight: 4 * 1_000_000_000,
 		max_upward_message_size: 1024 * 1024,
 		max_upward_message_num_per_candidate: 5,
-		_hrmp_open_request_ttl: 5,
 		hrmp_sender_deposit: 0,
 		hrmp_recipient_deposit: 0,
 		hrmp_channel_max_capacity: 8,

diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml
@@ -13,7 +13,7 @@ parity-scale-codec = { version = "2.0.0", default-features = false, features = [
 pin-project = "1.0.8"
 rand = "0.8.3"
 thiserror = "1.0.26"
-tracing = "0.1.26"
+tracing = "0.1.27"
 derive_more = "0.99.11"
 lru = "0.6.6"
 

diff --git a/node/subsystem-util/src/runtime/mod.rs b/node/subsystem-util/src/runtime/mod.rs
@@ -199,7 +199,7 @@ impl RuntimeInfo {
 	/// Build `ValidatorInfo` for the current session.
 	///
 	///
-	/// Returns: `None` if not a validator.
+	/// Returns: `None` if not a parachain validator.
 	async fn get_validator_info(&self, session_info: &SessionInfo) -> Result<ValidatorInfo> {
 		if let Some(our_index) = self.get_our_index(&session_info.validators).await {
 			// Get our group index:

diff --git a/node/test/polkadot-simnet/common/src/lib.rs b/node/test/polkadot-simnet/common/src/lib.rs
@@ -31,7 +31,7 @@ use sc_executor::NativeElseWasmExecutor;
 use sc_service::{TFullBackend, TFullClient};
 use sp_runtime::{app_crypto::sp_core::H256, generic::Era, AccountId32};
 use std::{error::Error, future::Future, str::FromStr};
-use support::{weights::Weight, StorageValue};
+use support::weights::Weight;
 use test_runner::{
 	build_runtime, client_parts, ChainInfo, ConfigOrChainSpec, Node, SignatureVerificationOverride,
 };

diff --git a/node/test/service/Cargo.toml b/node/test/service/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 futures = "0.3.17"
 futures01 = { package = "futures", version = "0.1.29" }
 hex = "0.4.3"
-tracing = "0.1.26"
+tracing = "0.1.27"
 rand = "0.8.3"
 tempfile = "3.2.0"
 tokio = "1.10.0"

diff --git a/primitives/src/v1/mod.rs b/primitives/src/v1/mod.rs
@@ -892,11 +892,31 @@ pub enum CandidateEvent<H = Hash> {
 #[cfg_attr(feature = "std", derive(PartialEq, Default, MallocSizeOf))]
 pub struct SessionInfo {
 	/// Validators in canonical ordering.
+	///
+	/// NOTE: There might be more authorities in the current session, than `validators` participating
+	/// in parachain consensus. See
+	/// [`max_validators`](https://github.com/paritytech/polkadot/blob/a52dca2be7840b23c19c153cf7e110b1e3e475f8/runtime/parachains/src/configuration.rs#L148).
+	///
+	/// `SessionInfo::validators` will be limited to to `max_validators` when set.
 	pub validators: Vec<ValidatorId>,
 	/// Validators' authority discovery keys for the session in canonical ordering.
+	///
+	/// NOTE: The first `validators.len()` entries will match the corresponding validators in
+	/// `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<AuthorityDiscoveryId>,
 	/// The assignment keys for validators.
+	///
+	/// NOTE: There might be more authorities in the current session, than validators participating
+	/// in parachain consensus. See
+	/// [`max_validators`](https://github.com/paritytech/polkadot/blob/a52dca2be7840b23c19c153cf7e110b1e3e475f8/runtime/parachains/src/configuration.rs#L148).
+	///
+	/// Therefore:
+	/// ```ignore
+	///		assignment_keys.len() == validators.len() && validators.len() <= discovery_keys.len()
+	///	```
 	pub assignment_keys: Vec<AssignmentId>,
 	/// Validators in shuffled ordering - these are the validator groups as produced
 	/// by the `Scheduler` module for the session and are typically referred to by