Merge remote-tracking branch 'origin/master' into s0me0ne/liberate-wo…

…rkers
paritytech · Aug 8, 2023 · dcbd057 · dcbd057
2 parents c9329ca + a1c8d72
commit dcbd057
Show file tree

Hide file tree

Showing 114 changed files with 518 additions and 256 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,17 +5,18 @@ path = "src/main.rs"
 [package]
 name = "polkadot"
 description = "Implementation of a `https://polkadot.network` node in Rust based on the Substrate framework."
-license = "GPL-3.0-only"
 rust-version = "1.64.0" # workspace properties
 readme = "README.md"
 default-run = "polkadot"
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 version.workspace = true
 
 [workspace.package]
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
+license = "GPL-3.0-only"
 repository = "https://github.com/paritytech/polkadot.git"
 version = "0.9.43"
 

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -4,6 +4,7 @@ description = "Polkadot Relay-chain Client Node"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [package.metadata.wasm-pack.profile.release]
 # `wasm-opt` has some problems on Linux, see

diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-core-primitives"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-erasure-coding"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 polkadot-primitives = { path = "../primitives" }

diff --git a/erasure-coding/fuzzer/Cargo.toml b/erasure-coding/fuzzer/Cargo.toml
@@ -3,6 +3,7 @@ name = "erasure_coding_fuzzer"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 publish = false
 
 [dependencies]

diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-collation-generation"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-approval-voting"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/av-store/Cargo.toml b/node/core/av-store/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-av-store"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/backing/Cargo.toml b/node/core/backing/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-backing"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/bitfield-signing/Cargo.toml b/node/core/bitfield-signing/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-bitfield-signing"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/candidate-validation/Cargo.toml b/node/core/candidate-validation/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "polkadot-node-core-candidate-validation"
+description = "Polkadot crate that implements the Candidate Validation subsystem. Handles requests to validate candidates according to a PVF."
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 async-trait = "0.1.57"

diff --git a/node/core/chain-api/Cargo.toml b/node/core/chain-api/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-chain-api"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/chain-selection/Cargo.toml b/node/core/chain-selection/Cargo.toml
@@ -4,6 +4,7 @@ description = "Chain Selection Subsystem"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/dispute-coordinator/Cargo.toml b/node/core/dispute-coordinator/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-dispute-coordinator"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/parachains-inherent/Cargo.toml b/node/core/parachains-inherent/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-parachains-inherent"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/provisioner/Cargo.toml b/node/core/provisioner/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-provisioner"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }

diff --git a/node/core/pvf-checker/Cargo.toml b/node/core/pvf-checker/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "polkadot-node-core-pvf-checker"
+description = "Polkadot crate that implements the PVF pre-checking subsystem. Responsible for checking and voting for PVFs that are pending approval."
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/pvf/Cargo.toml b/node/core/pvf/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "polkadot-node-core-pvf"
+description = "Polkadot crate that implements the PVF validation host. Responsible for coordinating preparation and execution of PVFs."
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [[bin]]
 name = "puppet_worker"

diff --git a/node/core/pvf/common/Cargo.toml b/node/core/pvf/common/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "polkadot-node-core-pvf-common"
+description = "Polkadot crate that contains functionality related to PVFs that is shared by the PVF host and the PVF workers."
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 cpu-time = "1.0.0"

diff --git a/node/core/pvf/common/src/lib.rs b/node/core/pvf/common/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Functionality that is shared by the host and the workers.
+//! Contains functionality related to PVFs that is shared by the PVF host and the PVF workers.
 
 pub mod error;
 pub mod execute;

diff --git a/node/core/pvf/execute-worker/Cargo.toml b/node/core/pvf/execute-worker/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "polkadot-node-core-pvf-execute-worker"
+description = "Polkadot crate that contains the logic for executing PVFs. Used by the polkadot-execute-worker binary."
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 cpu-time = "1.0.0"

diff --git a/node/core/pvf/execute-worker/src/lib.rs b/node/core/pvf/execute-worker/src/lib.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+//! Contains the logic for executing PVFs. Used by the polkadot-execute-worker binary.
+
 pub use polkadot_node_core_pvf_common::executor_intf::Executor;
 
 // NOTE: Initializing logging in e.g. tests will not have an effect in the workers, as they are

diff --git a/node/core/pvf/prepare-worker/Cargo.toml b/node/core/pvf/prepare-worker/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "polkadot-node-core-pvf-prepare-worker"
+description = "Polkadot crate that contains the logic for preparing PVFs. Used by the polkadot-prepare-worker binary."
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/core/pvf/prepare-worker/src/lib.rs b/node/core/pvf/prepare-worker/src/lib.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+//! Contains the logic for preparing PVFs. Used by the polkadot-prepare-worker binary.
+
 mod executor_intf;
 mod memory_stats;
 

diff --git a/node/core/pvf/src/lib.rs b/node/core/pvf/src/lib.rs
@@ -16,7 +16,7 @@
 
 #![warn(missing_docs)]
 
-//! A crate that implements the PVF validation host.
+//! The PVF validation host. Responsible for coordinating preparation and execution of PVFs.
 //!
 //! For more background, refer to the Implementer's Guide: [PVF
 //! Pre-checking](https://paritytech.github.io/polkadot/book/pvf-prechecking.html) and [Candidate

diff --git a/node/core/runtime-api/Cargo.toml b/node/core/runtime-api/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-core-runtime-api"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/gum/Cargo.toml b/node/gum/Cargo.toml
@@ -3,6 +3,7 @@ name = "tracing-gum"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 description = "Stick logs together with the TraceID as provided by tempo"
 
 [dependencies]

diff --git a/node/gum/proc-macro/Cargo.toml b/node/gum/proc-macro/Cargo.toml
@@ -3,6 +3,7 @@ name = "tracing-gum-proc-macro"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 description = "Generate an overseer including builder pattern and message wrapper from a single annotated struct definition."
 
 [package.metadata.docs.rs]

diff --git a/node/jaeger/Cargo.toml b/node/jaeger/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-node-jaeger"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 description = "Polkadot Jaeger primitives, but equally useful for Grafana/Tempo"
 
 [dependencies]

diff --git a/node/malus/Cargo.toml b/node/malus/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "polkadot-test-malus"
 description = "Misbehaving nodes for local testnets, system and Simnet tests."
-license = "GPL-3.0-only"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 readme = "README.md"
 publish = false
 

diff --git a/node/metrics/Cargo.toml b/node/metrics/Cargo.toml
@@ -4,6 +4,7 @@ description = "Subsystem metric helpers"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/network/approval-distribution/Cargo.toml b/node/network/approval-distribution/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-approval-distribution"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 polkadot-node-metrics = { path = "../../metrics" }

diff --git a/node/network/availability-distribution/Cargo.toml b/node/network/availability-distribution/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-availability-distribution"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/network/availability-recovery/Cargo.toml b/node/network/availability-recovery/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-availability-recovery"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/network/bitfield-distribution/Cargo.toml b/node/network/bitfield-distribution/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-availability-bitfield-distribution"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 futures = "0.3.21"

diff --git a/node/network/bitfield-distribution/src/tests.rs b/node/network/bitfield-distribution/src/tests.rs
@@ -428,8 +428,6 @@ fn receive_duplicate_messages() {
 }
 
 #[test]
-// FIXME <https://github.com/paritytech/polkadot/issues/7407>
-#[cfg(feature = "enable-flaky")]
 fn delay_reputation_change() {
 	use polkadot_node_subsystem_util::reputation::add_reputation;
 
@@ -471,7 +469,7 @@ fn delay_reputation_change() {
 	let pool = sp_core::testing::TaskExecutor::new();
 	let (ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
 	let mut rng = dummy_rng();
-	let reputation_interval = Duration::from_millis(1);
+	let reputation_interval = Duration::from_millis(100);
 
 	let bg = async move {
 		let subsystem = BitfieldDistribution::new(Default::default());

diff --git a/node/network/bridge/Cargo.toml b/node/network/bridge/Cargo.toml
@@ -3,6 +3,7 @@ name = "polkadot-network-bridge"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+license.workspace = true
 
 [dependencies]
 always-assert = "0.1"

diff --git a/node/network/bridge/src/network.rs b/node/network/bridge/src/network.rs
@@ -94,7 +94,11 @@ pub trait Network: Clone + Send + 'static {
 	) -> Result<(), String>;
 
 	/// Removes the peers for the protocol's peer set (both reserved and non-reserved).
-	async fn remove_from_peers_set(&mut self, protocol: ProtocolName, peers: Vec<PeerId>);
+	async fn remove_from_peers_set(
+		&mut self,
+		protocol: ProtocolName,
+		peers: Vec<PeerId>,
+	) -> Result<(), String>;
 
 	/// Send a request to a remote peer.
 	async fn start_request<AD: AuthorityDiscovery>(
@@ -129,8 +133,12 @@ impl Network for Arc<NetworkService<Block, Hash>> {
 		NetworkService::set_reserved_peers(&**self, protocol, multiaddresses)
 	}
 
-	async fn remove_from_peers_set(&mut self, protocol: ProtocolName, peers: Vec<PeerId>) {
-		NetworkService::remove_peers_from_reserved_set(&**self, protocol, peers);
+	async fn remove_from_peers_set(
+		&mut self,
+		protocol: ProtocolName,
+		peers: Vec<PeerId>,
+	) -> Result<(), String> {
+		NetworkService::remove_peers_from_reserved_set(&**self, protocol, peers)
 	}
 
 	fn report_peer(&self, who: PeerId, rep: ReputationChange) {

diff --git a/node/network/bridge/src/rx/tests.rs b/node/network/bridge/src/rx/tests.rs
@@ -117,7 +117,13 @@ impl Network for TestNetwork {
 		Ok(())
 	}
 
-	async fn remove_from_peers_set(&mut self, _protocol: ProtocolName, _: Vec<PeerId>) {}
+	async fn remove_from_peers_set(
+		&mut self,
+		_protocol: ProtocolName,
+		_: Vec<PeerId>,
+	) -> Result<(), String> {
+		Ok(())
+	}
 
 	async fn start_request<AD: AuthorityDiscovery>(
 		&self,