approval-rewards: on-chain statistics collector

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 }

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 {

cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs

@@ -305,6 +305,18 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 			.await?)
 	}
 
+	async fn submit_approval_statistics(
+		&self,
+		at: Hash,
+		payload: polkadot_primitives::vstaging::ApprovalStatistics,
+		signature: polkadot_primitives::ValidatorSignature,
+	) -> Result<(), sp_api::ApiError> {
+		Ok(self
+			.rpc_client
+			.parachain_host_submit_approval_statistics(at, payload, signature)
+			.await?)
+	}
+
 	async fn pvfs_require_precheck(
 		&self,
 		at: Hash,

cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs

@@ -54,6 +54,7 @@ use sp_version::RuntimeVersion;
 
 use crate::{metrics::RelaychainRpcMetrics, reconnecting_ws_client::ReconnectingWebsocketWorker};
 pub use url::Url;
+use cumulus_primitives_core::relay_chain::vstaging::ApprovalStatistics;
 
 const LOG_TARGET: &str = "relay-chain-rpc-client";
 const NOTIFICATION_CHANNEL_SIZE_LIMIT: usize = 20;
@@ -261,6 +262,21 @@ impl RelayChainRpcClient {
 		.await
 	}
 
+	/// Submits approval voting rewards statistics into the transaction pool.
+	pub async fn parachain_host_submit_approval_statistics(
+		&self,
+		at: RelayHash,
+		payload: ApprovalStatistics,
+		signature: ValidatorSignature,
+	) -> Result<(), RelayChainError> {
+		self.call_remote_runtime_function(
+			"ParachainHost_submit_approval_statistics",
+			at,
+			Some((payload, signature)),
+		)
+			.await
+	}
+
 	/// Get system health information
 	pub async fn system_health(&self) -> Result<Health, RelayChainError> {
 		self.request("system_health", rpc_params![]).await

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}}}")
+}

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)]

polkadot/cli/src/command.rs

@@ -278,6 +278,10 @@ 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,

polkadot/node/core/approval-voting/benches/approval-voting-regression-bench.rs

@@ -83,6 +83,8 @@ 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", 12.3817, 0.1)]));
+
 
 	if messages.is_empty() {
 		Ok(())

polkadot/node/core/approval-voting/src/import.rs

@@ -66,7 +66,7 @@ use crate::{
 };
 
 use polkadot_node_primitives::approval::time::{slot_number_to_tick, Tick};
-
+use polkadot_node_subsystem::messages::RewardsStatisticsCollectorMessage;
 use super::{State, LOG_TARGET};
 
 #[derive(Debug)]
@@ -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,
 >(