Approvals usage collection

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

@@ -320,6 +320,7 @@ pub struct BlockImportedCandidates {
 	pub block_hash: Hash,
 	pub block_number: BlockNumber,
 	pub block_tick: Tick,
+	pub session_index: SessionIndex,
 	pub imported_candidates: Vec<(CandidateHash, CandidateEntry)>,
 }
 
@@ -341,7 +342,7 @@ pub(crate) async fn handle_new_head<
 >(
 	sender: &mut Sender,
 	approval_voting_sender: &mut AVSender,
-	state: &State,
+	state: &mut State,
 	db: &mut OverlayedBackend<'_, B>,
 	session_info_provider: &mut RuntimeInfo,
 	head: Hash,
@@ -580,6 +581,7 @@ pub(crate) async fn handle_new_head<
 			block_hash,
 			block_number: block_header.number,
 			block_tick,
+			session_index: session_index,
 			imported_candidates: candidate_entries
 				.into_iter()
 				.map(|(h, e)| (h, e.into()))
@@ -653,7 +655,7 @@ pub(crate) mod tests {
 		}
 	}
 
-	fn blank_state() -> State {
+	pub fn blank_state() -> State {
 		State {
 			keystore: Arc::new(LocalKeystore::in_memory()),
 			slot_duration_millis: 6_000,
@@ -663,6 +665,8 @@ pub(crate) mod tests {
 				MAX_BLOCKS_WITH_ASSIGNMENT_TIMESTAMPS,
 			)),
 			no_show_stats: Default::default(),
+			last_session_index: None,
+			approvals_usage: Default::default(),
 		}
 	}
 
@@ -1356,7 +1360,7 @@ pub(crate) mod tests {
 			.map(|(r, c, g)| CandidateEvent::CandidateIncluded(r, Vec::new().into(), c, g))
 			.collect::<Vec<_>>();
 
-		let (state, mut session_info_provider) = single_session_state();
+		let (mut state, mut session_info_provider) = single_session_state();
 		overlay_db.write_block_entry(
 			v3::BlockEntry {
 				block_hash: parent_hash,
@@ -1385,7 +1389,7 @@ pub(crate) mod tests {
 				let result = handle_new_head(
 					ctx.sender(),
 					&mut approval_voting_sender,
-					&state,
+					&mut state,
 					&mut overlay_db,
 					&mut session_info_provider,
 					hash,

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

@@ -85,7 +85,6 @@ use std::{
 	sync::Arc,
 	time::Duration,
 };
-
 use schnellru::{ByLength, LruMap};
 
 use approval_checking::RequiredTranches;
@@ -891,15 +890,32 @@ struct State {
 	keystore: Arc<LocalKeystore>,
 	slot_duration_millis: u64,
 	clock: Arc<dyn Clock + Send + Sync>,
+	last_session_index: Option<SessionIndex>,
 	assignment_criteria: Box<dyn AssignmentCriteria + Send + Sync>,
 	// Per block, candidate records about how long we take until we gather enough
 	// assignments, this is relevant because it gives us a good idea about how many
 	// tranches we trigger and why.
 	per_block_assignments_gathering_times:
 		LruMap<BlockNumber, HashMap<(Hash, CandidateHash), AssignmentGatheringRecord>>,
 	no_show_stats: NoShowStats,
+
+	candidates_per_session: HashMap<SessionIndex, Vec<CandidateHash>>,
+
+	// amount of approvals usage per epoch per validator index
+	// where the ith index in the vector corresponds to the
+	approvals_usage: HashMap<SessionIndex, Vec<ApprovalTallyLine>>,
+}
+
+/// Our subjective record of what we used from some other validator on the finalized chain
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct ApprovalTallyLine {
+	/// Approvals by this validator which our approvals gadget used in marking candidates approved.
+	approval_usages: u32,
 }
 
+#[derive(Clone, Debug)]
+struct ApprovalsTally((SessionIndex, Vec<ApprovalTallyLine>));
+
 // Regularly dump the no-show stats at this block number frequency.
 const NO_SHOW_DUMP_FREQUENCY: BlockNumber = 50;
 // The maximum number of validators we record no-shows for, per candidate.
@@ -982,7 +998,7 @@ impl State {
 			block_entry.parent_hash(),
 			block_entry.session(),
 		)
-		.await
+			.await
 		{
 			Some(s) => s,
 			None => return None,
@@ -1252,11 +1268,14 @@ where
 		keystore: subsystem.keystore,
 		slot_duration_millis: subsystem.slot_duration_millis,
 		clock: subsystem.clock,
+		last_session_index: None,
 		assignment_criteria,
 		per_block_assignments_gathering_times: LruMap::new(ByLength::new(
 			MAX_BLOCKS_WITH_ASSIGNMENT_TIMESTAMPS,
 		)),
 		no_show_stats: NoShowStats::default(),
+		candidates_per_session: Default::default(),
+		approvals_usage: Default::default(),
 	};
 
 	let mut last_finalized_height: Option<BlockNumber> = {
@@ -2053,6 +2072,11 @@ async fn handle_from_overseer<
 							for (c_hash, c_entry) in block_batch.imported_candidates {
 								metrics.on_candidate_imported();
 
+								state.candidates_per_session
+									.entry(c_entry.session)
+									.and_modify(|candidates| { candidates.push(c_hash.clone()) })
+									.or_insert_with(|| vec![c_hash.clone()]);
+
 								let our_tranche = c_entry
 									.approval_entry(&block_batch.block_hash)
 									.and_then(|a| a.our_assignment().map(|a| a.tranche()));
@@ -2088,8 +2112,56 @@ async fn handle_from_overseer<
 		},
 		FromOrchestra::Signal(OverseerSignal::BlockFinalized(block_hash, block_number)) => {
 			gum::debug!(target: LOG_TARGET, ?block_hash, ?block_number, "Block finalized");
-			*last_finalized_height = Some(block_number);
+			let finalized_tip = db.load_block_entry(&block_hash)?.unwrap();
+
+			let is_new_session = match state.last_session_index {
+				Some(last_session) if finalized_tip.session() > last_session => true,
+				Some(_) => false,
+				None => true,
+			};
+
+			if is_new_session {
+				let retrieve_size: usize = last_finalized_height
+					.clone()
+					.map_or(block_number, |b| block_number - (b as u32)) as usize;
+
+				let finalized_hashes: HashSet<Hash> = fetch_ancestry(
+					sender,
+					block_hash,
+					retrieve_size,
+				).await?.into_iter().collect();
+
+				let mut prev_session_approvals: HashMap<usize, u32> = HashMap::new();
+				let prev = (finalized_tip.session() as u32).saturating_sub(1) as SessionIndex;
+				let candidates = match state.candidates_per_session.remove(&prev) {
+					Some(candidates) => candidates,
+					_ => vec![],
+				};
+
+				for c_hash in candidates {
+					match db.load_candidate_entry(&c_hash)? {
+						Some(candidate) => {
+							let on_finalized_block = candidate.block_assignments
+								.keys()
+								.any(|b_hash| finalized_hashes.contains(b_hash));
+
+							if on_finalized_block {
+								for idx in candidate.approvals.iter_ones() {
+									prev_session_approvals
+										.entry(idx as usize)
+										.and_modify(|e| *e += 1)
+										.or_insert(0);
+								}
+							}
+						},
+						_ => {},
+					}
+				};
 
+				state.last_session_index = Some(finalized_tip.session());
+			};
+
+			*last_finalized_height = Some(block_number);
 			crate::ops::canonicalize(db, block_number, block_hash)
 				.map_err(|e| SubsystemError::with_origin("db", e))?;
 
@@ -2986,6 +3058,15 @@ where
 		actions.extend(new_actions);
 	}
 
+	let block_entry = match db.load_block_entry(&approval.block_hash)? {
+		Some(b) => b,
+		None => {
+			respond_early!(ApprovalCheckResult::Bad(ApprovalCheckError::UnknownBlock(
+				approval.block_hash
+			),))
+		},
+	};
+
 	// importing the approval can be heavy as it may trigger acceptance for a series of blocks.
 	Ok((actions, ApprovalCheckResult::Accepted))
 }
@@ -3971,6 +4052,33 @@ async fn maybe_create_signature<
 	Ok(None)
 }
 
+// Fetch ancestors in descending order, up to the amount requested.
+#[overseer::contextbounds(ApprovalVoting, prefix = self::overseer)]
+async fn fetch_ancestry<Sender: SubsystemSender<ChainApiMessage>>(
+	sender: &mut Sender,
+	relay_hash: Hash,
+	ancestors: usize,
+) -> SubsystemResult<Vec<Hash>> {
+	if ancestors == 0 {
+		return Ok(Vec::new())
+	}
+
+	let (tx, rx) = oneshot::channel();
+	sender.send_message(ChainApiMessage::Ancestors {
+		hash: relay_hash,
+		k: ancestors,
+		response_channel: tx,
+	}).await;
+
+	let hashes = match rx.await {
+		Ok(Ok(hashes)) => hashes,
+		Ok(Err(e)) => return Err(SubsystemError::with_origin("chain-api", e)),
+		Err(e) => return Err(SubsystemError::with_origin("chain-api", e)),
+	};
+
+	Ok(hashes)
+}
+
 // Sign an approval vote. Fails if the key isn't present in the store.
 fn sign_approval(
 	keystore: &LocalKeystore,

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

@@ -5638,6 +5638,8 @@ fn test_gathering_assignments_statements() {
 			MAX_BLOCKS_WITH_ASSIGNMENT_TIMESTAMPS,
 		)),
 		no_show_stats: NoShowStats::default(),
+		last_session_index: None,
+		approvals_usage: Default::default(),
 	};
 
 	for i in 0..200i32 {
@@ -5732,6 +5734,8 @@ fn test_observe_assignment_gathering_status() {
 			MAX_BLOCKS_WITH_ASSIGNMENT_TIMESTAMPS,
 		)),
 		no_show_stats: NoShowStats::default(),
+		last_session_index: None,
+		approvals_usage: Default::default(),
 	};
 
 	let metrics_inner = MetricsInner {