Merge branch 'master' into shawntabrizi-xcm-tweaks

paritytech · Nov 15, 2021 · 413379a · 413379a
2 parents e7c8c8e + 13c2695
commit 413379a
Show file tree

Hide file tree

Showing 76 changed files with 333 additions and 317 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ path = "src/main.rs"
 name = "polkadot"
 description = "Implementation of a https://polkadot.network node in Rust based on the Substrate framework."
 license = "GPL-3.0-only"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 readme = "README.md"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-cli"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Polkadot Relay-chain Client Node"
 edition = "2018"

diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-core-primitives"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-erasure-coding"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/erasure-coding/fuzzer/Cargo.toml b/erasure-coding/fuzzer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "erasure_coding_fuzzer"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/client/Cargo.toml b/node/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-client"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-collation-generation"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-approval-voting"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-av-store"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-backing"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/bitfield-signing/Cargo.toml b/node/core/bitfield-signing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-bitfield-signing"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-candidate-validation"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-chain-api"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-node-core-chain-selection"
 description = "Chain Selection Subsystem"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/dispute-participation/Cargo.toml b/node/core/dispute-participation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-dispute-participation"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/parachains-inherent/Cargo.toml b/node/core/parachains-inherent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-parachains-inherent"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/provisioner/Cargo.toml b/node/core/provisioner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-provisioner"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-pvf"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/core/pvf/src/metrics.rs b/node/core/pvf/src/metrics.rs
@@ -152,8 +152,21 @@ impl metrics::Metrics for Metrics {
 				prometheus::Histogram::with_opts(
 					prometheus::HistogramOpts::new(
 						"pvf_preparation_time",
-						"Time spent in preparing PVF artifacts",
+						"Time spent in preparing PVF artifacts in seconds",
 					)
+					.buckets(vec![
+						// This is synchronized with COMPILATION_TIMEOUT=60s constant found in
+						// src/prepare/worker.rs
+						0.1,
+						0.5,
+						1.0,
+						10.0,
+						20.0,
+						30.0,
+						40.0,
+						50.0,
+						60.0,
+					]),
 				)?,
 				registry,
 			)?,

diff --git a/node/core/pvf/src/prepare/worker.rs b/node/core/pvf/src/prepare/worker.rs
@@ -35,7 +35,9 @@ use std::{sync::Arc, time::Duration};
 const NICENESS_BACKGROUND: i32 = 10;
 const NICENESS_FOREGROUND: i32 = 0;
 
-const COMPILATION_TIMEOUT: Duration = Duration::from_secs(10);
+/// The time period after which the preparation worker is considered unresponsive and will be killed.
+// NOTE: If you change this make sure to fix the buckets of `pvf_preparation_time` metric.
+const COMPILATION_TIMEOUT: Duration = Duration::from_secs(60);
 
 /// Spawns a new worker with the given program path that acts as the worker and the spawn timeout.
 ///

diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-core-runtime-api"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/jaeger/Cargo.toml b/node/jaeger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-jaeger"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Polkadot Jaeger primitives"

diff --git a/node/malus/Cargo.toml b/node/malus/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/variant-a.rs"
 name = "polkadot-test-malus"
 description = "Misbehaving nodes for local testnets, system and Simnet tests."
 license = "GPL-3.0-only"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 readme = "README.md"

diff --git a/node/metered-channel/Cargo.toml b/node/metered-channel/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "metered-channel"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Channels with attached Meters"

diff --git a/node/metrics/Cargo.toml b/node/metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-metrics"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Subsystem traits and message definitions"

diff --git a/node/network/approval-distribution/Cargo.toml b/node/network/approval-distribution/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-approval-distribution"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-availability-distribution"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/network/availability-recovery/Cargo.toml b/node/network/availability-recovery/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-availability-recovery"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/network/bitfield-distribution/Cargo.toml b/node/network/bitfield-distribution/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-availability-bitfield-distribution"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-network-bridge"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/network/collator-protocol/Cargo.toml b/node/network/collator-protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-collator-protocol"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/network/dispute-distribution/Cargo.toml b/node/network/dispute-distribution/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-dispute-distribution"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/network/gossip-support/Cargo.toml b/node/network/gossip-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-gossip-support"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/network/protocol/Cargo.toml b/node/network/protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-network-protocol"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Primitives types for the Node-side"

diff --git a/node/network/statement-distribution/Cargo.toml b/node/network/statement-distribution/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-statement-distribution"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Statement Distribution Subsystem"
 edition = "2018"

diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-overseer"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/overseer/overseer-gen/Cargo.toml b/node/overseer/overseer-gen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-overseer-gen"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Generate an overseer including builder pattern and message wrapper from a single struct."

diff --git a/node/overseer/overseer-gen/proc-macro/Cargo.toml b/node/overseer/overseer-gen/proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-overseer-gen-proc-macro"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Generate an overseer including builder pattern and message wrapper from a single annotated struct definition."

diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-primitives"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Primitives types for the Node-side"

diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-service"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/subsystem-test-helpers/Cargo.toml b/node/subsystem-test-helpers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-subsystem-test-helpers"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Subsystem traits and message definitions"

diff --git a/node/subsystem-types/Cargo.toml b/node/subsystem-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-subsystem-types"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Subsystem traits and message definitions"

diff --git a/node/subsystem-util/Cargo.toml b/node/subsystem-util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-subsystem-util"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Subsystem traits and message definitions"

diff --git a/node/subsystem/Cargo.toml b/node/subsystem/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-node-subsystem"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 description = "Subsystem traits and message definitions and the generated overseer"

diff --git a/node/test/client/Cargo.toml b/node/test/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-test-client"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/node/test/polkadot-simnet/common/Cargo.toml b/node/test/polkadot-simnet/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-simnet"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"