approval-voting improvement: include all tranche0 assignments in one certificate

node/core/approval-voting/Cargo.toml

@@ -16,6 +16,7 @@ schnorrkel = "0.9.1"
 kvdb = "0.13.0"
 derive_more = "0.99.17"
 thiserror = "1.0.31"
+itertools = "0.10.5"
 
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }

node/core/approval-voting/src/approval_checking.rs

@@ -17,7 +17,7 @@
 //! Utilities for checking whether a candidate has been approved under a given block.
 
 use bitvec::{order::Lsb0 as BitOrderLsb0, slice::BitSlice};
-use polkadot_node_primitives::approval::DelayTranche;
+use polkadot_node_primitives::approval::v1::DelayTranche;
 use polkadot_primitives::ValidatorIndex;
 
 use crate::{
@@ -474,7 +474,7 @@ mod tests {
 
 		let approval_entry = approval_db::v1::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: BitVec::default(),
+			assigned_validators: BitVec::default(),
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -524,7 +524,7 @@ mod tests {
 					assignments: (5..10).map(|i| (ValidatorIndex(i), 0.into())).collect(),
 				},
 			],
-			assignments: bitvec![u8, BitOrderLsb0; 1; 10],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 1; 10],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -596,7 +596,7 @@ mod tests {
 					assignments: (6..10).map(|i| (ValidatorIndex(i), 0.into())).collect(),
 				},
 			],
-			assignments: bitvec![u8, BitOrderLsb0; 1; 10],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 1; 10],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -649,7 +649,7 @@ mod tests {
 
 		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; 5],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; 5],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -693,7 +693,7 @@ mod tests {
 
 		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; 10],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; 10],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -733,7 +733,7 @@ mod tests {
 
 		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; 10],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; 10],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -778,7 +778,7 @@ mod tests {
 
 		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; n_validators],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; n_validators],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -845,7 +845,7 @@ mod tests {
 
 		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; n_validators],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; n_validators],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -936,7 +936,7 @@ mod tests {
 
 		let mut approval_entry: ApprovalEntry = approval_db::v1::ApprovalEntry {
 			tranches: Vec::new(),
-			assignments: bitvec![u8, BitOrderLsb0; 0; n_validators],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 0; n_validators],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -1049,7 +1049,7 @@ mod tests {
 					assignments: (2..5).map(|i| (ValidatorIndex(i), 1.into())).collect(),
 				},
 			],
-			assignments: bitvec![u8, BitOrderLsb0; 1; 3],
+			assigned_validators: bitvec![u8, BitOrderLsb0; 1; 3],
 			our_assignment: None,
 			our_approval_sig: None,
 			backing_group: GroupIndex(0),
@@ -1099,7 +1099,7 @@ mod tests {
 				backing_group: GroupIndex(0),
 				our_assignment: None,
 				our_approval_sig: None,
-				assignments: bitvec![u8, BitOrderLsb0; 0; 3],
+				assigned_validators: bitvec![u8, BitOrderLsb0; 0; 3],
 				approved: false,
 			}
 			.into();

node/core/approval-voting/src/approval_db/v1/mod.rs

@@ -17,7 +17,10 @@
 //! Version 1 of the DB schema.
 
 use parity_scale_codec::{Decode, Encode};
-use polkadot_node_primitives::approval::{AssignmentCert, DelayTranche};
+use polkadot_node_primitives::approval::{
+	v1::DelayTranche,
+	v2::{AssignmentCertV2, CoreBitfield},
+};
 use polkadot_node_subsystem::{SubsystemError, SubsystemResult};
 use polkadot_node_subsystem_util::database::{DBTransaction, Database};
 use polkadot_primitives::{
@@ -161,11 +164,16 @@ pub struct Config {
 /// Details pertaining to our assignment on a block.
 #[derive(Encode, Decode, Debug, Clone, PartialEq)]
 pub struct OurAssignment {
-	pub cert: AssignmentCert,
+	/// Our assignment certificate.
+	pub cert: AssignmentCertV2,
+	/// The tranche for which the assignment refers to.
 	pub tranche: DelayTranche,
+	/// Our validator index for the session in which the candidates were included.
 	pub validator_index: ValidatorIndex,
-	// Whether the assignment has been triggered already.
+	/// Whether the assignment has been triggered already.
 	pub triggered: bool,
+	/// A subset of the core indices obtained from the VRF output.
+	pub assignment_bitfield: CoreBitfield,
 }
 
 /// Metadata regarding a specific tranche of assignments for a specific candidate.
@@ -186,7 +194,7 @@ pub struct ApprovalEntry {
 	pub our_assignment: Option<OurAssignment>,
 	pub our_approval_sig: Option<ValidatorSignature>,
 	// `n_validators` bits.
-	pub assignments: Bitfield,
+	pub assigned_validators: Bitfield,
 	pub approved: bool,
 }
 

node/core/approval-voting/src/approval_db/v1/tests.rs

@@ -98,7 +98,7 @@ fn read_write() {
 				backing_group: GroupIndex(1),
 				our_assignment: None,
 				our_approval_sig: None,
-				assignments: Default::default(),
+				assigned_validators: Default::default(),
 				approved: false,
 			},
 		)]