paritytech · EclesioMeloJunior · Sep 8, 2025 · Sep 9, 2025 · Sep 9, 2025 · Sep 9, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -179,6 +179,7 @@ members = [
 	"polkadot/node/core/dispute-coordinator",
 	"polkadot/node/core/parachains-inherent",
 	"polkadot/node/core/prospective-parachains",
+	"polkadot/node/core/rewards-statistics-collector",
 	"polkadot/node/core/provisioner",
 	"polkadot/node/core/pvf",
 	"polkadot/node/core/pvf-checker",
@@ -1139,6 +1140,7 @@ polkadot-node-core-chain-selection = { path = "polkadot/node/core/chain-selectio
 polkadot-node-core-dispute-coordinator = { path = "polkadot/node/core/dispute-coordinator", default-features = false }
 polkadot-node-core-parachains-inherent = { path = "polkadot/node/core/parachains-inherent", default-features = false }
 polkadot-node-core-prospective-parachains = { path = "polkadot/node/core/prospective-parachains", default-features = false }
+polkadot-node-core-rewards-statistics-collector = { path = "polkadot/node/core/rewards-statistics-collector", default-features = false }
 polkadot-node-core-provisioner = { path = "polkadot/node/core/provisioner", default-features = false }
 polkadot-node-core-pvf = { path = "polkadot/node/core/pvf", default-features = false }
 polkadot-node-core-pvf-checker = { path = "polkadot/node/core/pvf-checker", default-features = false }

diff --git a/cumulus/client/relay-chain-inprocess-interface/src/lib.rs b/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
@@ -419,6 +419,7 @@ fn build_polkadot_full_node(
 		keep_finalized_for: None,
 		invulnerable_ah_collators: HashSet::new(),
 		collator_protocol_hold_off: None,
+		verbose_approval_metrics: false,
 	};
 
 	let (relay_chain_full_node, paranode_req_receiver) = match config.network.network_backend {

diff --git a/cumulus/zombienet/zombienet-sdk-helpers/src/lib.rs b/cumulus/zombienet/zombienet-sdk-helpers/src/lib.rs
@@ -552,3 +552,12 @@ pub async fn wait_for_runtime_upgrade(
 
 	Err(anyhow!("Did not find a runtime upgrade"))
 }
+
+pub fn report_label_with_attributes(label: &str, attributes: Vec<(&str, &str)>) -> String {
+	let mut attrs: Vec<String> = vec![];
+	for (k, v) in attributes {
+		attrs.push(format!("{}=\"{}\"", k, v));
+	}
+	let final_attrs = attrs.join(",");
+	format!("{label}{{{final_attrs}}}")
+}
diff --git a/polkadot/cli/src/cli.rs b/polkadot/cli/src/cli.rs
@@ -166,6 +166,11 @@ pub struct RunCmd {
 	///  **Dangerous!** Do not touch unless explicitly advised to.
 	#[arg(long, hide = true)]
 	pub collator_protocol_hold_off: Option<u64>,
+
+	/// Enable or disable per validator collected approvals metrics
+	/// to be published to prometheus. If not specified, set to false.
+	#[arg(long)]
+	pub verbose_approval_metrics: Option<bool>,
 }
 
 #[allow(missing_docs)]

diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
@@ -278,6 +278,7 @@ where
 				telemetry_worker_handle: None,
 				node_version,
 				secure_validator_mode,
+				verbose_approval_metrics: cli.run.verbose_approval_metrics.unwrap_or(false),
 				workers_path: cli.run.workers_path,
 				workers_names: None,
 				overseer_gen,

diff --git a/polkadot/node/core/approval-voting/benches/approval-voting-regression-bench.rs b/polkadot/node/core/approval-voting/benches/approval-voting-regression-bench.rs
@@ -83,6 +83,11 @@ fn main() -> Result<(), String> {
 		("Sent to peers", 63995.2200, 0.01),
 	]));
 	messages.extend(average_usage.check_cpu_usage(&[("approval-voting-parallel", 12.3817, 0.1)]));
+	messages.extend(average_usage.check_cpu_usage(&[(
+		"rewards-statistics-collector",
+		0.0085,
+		0.0009,
+	)]));
 
 	if messages.is_empty() {
 		Ok(())

diff --git a/polkadot/node/core/approval-voting/src/import.rs b/polkadot/node/core/approval-voting/src/import.rs
@@ -65,9 +65,9 @@ use crate::{
 	persisted_entries::CandidateEntry,
 };
 
-use polkadot_node_primitives::approval::time::{slot_number_to_tick, Tick};
-
 use super::{State, LOG_TARGET};
+use polkadot_node_primitives::approval::time::{slot_number_to_tick, Tick};
+use polkadot_node_subsystem::messages::RewardsStatisticsCollectorMessage;
 
 #[derive(Debug)]
 struct ImportedBlockInfo {
@@ -337,7 +337,8 @@ pub struct BlockImportedCandidates {
 pub(crate) async fn handle_new_head<
 	Sender: SubsystemSender<ChainApiMessage>
 		+ SubsystemSender<RuntimeApiMessage>
-		+ SubsystemSender<ChainSelectionMessage>,
+		+ SubsystemSender<ChainSelectionMessage>
+		+ SubsystemSender<RewardsStatisticsCollectorMessage>,
 	AVSender: SubsystemSender<ApprovalDistributionMessage>,
 	B: Backend,
 >(