Executor Environment parameterization

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

@@ -21,8 +21,8 @@ use polkadot_node_primitives::approval::{
 	self as approval_types, AssignmentCert, AssignmentCertKind, DelayTranche, RelayVRFStory,
 };
 use polkadot_primitives::{
-	AssignmentId, AssignmentPair, CandidateHash, CoreIndex, GroupIndex, IndexedVec, SessionInfo,
-	ValidatorIndex,
+	v3::SessionInfo, AssignmentId, AssignmentPair, CandidateHash, CoreIndex, GroupIndex,
+	IndexedVec, ValidatorIndex,
 };
 use sc_keystore::LocalKeystore;
 use sp_application_crypto::ByteArray;

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

@@ -617,7 +617,9 @@ pub(crate) mod tests {
 	use polkadot_node_subsystem::messages::{AllMessages, ApprovalVotingMessage};
 	use polkadot_node_subsystem_test_helpers::make_subsystem_context;
 	use polkadot_node_subsystem_util::database::Database;
-	use polkadot_primitives::{Id as ParaId, IndexedVec, SessionInfo, ValidatorId, ValidatorIndex};
+	use polkadot_primitives::{
+		v3::SessionInfo, Id as ParaId, IndexedVec, ValidatorId, ValidatorIndex,
+	};
 	pub(crate) use sp_consensus_babe::{
 		digests::{CompatibleDigestItem, PreDigest, SecondaryVRFPreDigest},
 		AllowedSlots, BabeEpochConfiguration, Epoch as BabeEpoch,
@@ -712,6 +714,7 @@ pub(crate) mod tests {
 
 	fn dummy_session_info(index: SessionIndex) -> SessionInfo {
 		SessionInfo {
+			executor_params: Default::default(),
 			validators: Default::default(),
 			discovery_keys: Vec::new(),
 			assignment_keys: Vec::new(),
@@ -1166,6 +1169,7 @@ pub(crate) mod tests {
 		let irrelevant = 666;
 		let session_info =
 			SessionInfo {
+				executor_params: Default::default(),
 				validators: IndexedVec::<ValidatorIndex, ValidatorId>::from(
 					vec![Sr25519Keyring::Alice.public().into(); 6],
 				),

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

@@ -49,9 +49,9 @@ use polkadot_node_subsystem_util::{
 	TimeoutExt,
 };
 use polkadot_primitives::{
-	ApprovalVote, BlockNumber, CandidateHash, CandidateIndex, CandidateReceipt, DisputeStatement,
-	GroupIndex, Hash, SessionIndex, SessionInfo, ValidDisputeStatementKind, ValidatorId,
-	ValidatorIndex, ValidatorPair, ValidatorSignature,
+	v3::SessionInfo, ApprovalVote, BlockNumber, CandidateHash, CandidateIndex, CandidateReceipt,
+	DisputeStatement, ExecutorParams, GroupIndex, Hash, SessionIndex, ValidDisputeStatementKind,
+	ValidatorId, ValidatorIndex, ValidatorPair, ValidatorSignature,
 };
 use sc_keystore::LocalKeystore;
 use sp_application_crypto::Pair;
@@ -745,6 +745,7 @@ enum Action {
 		relay_block_hash: Hash,
 		candidate_index: CandidateIndex,
 		session: SessionIndex,
+		executor_params: ExecutorParams,
 		candidate: CandidateReceipt,
 		backing_group: GroupIndex,
 	},
@@ -960,6 +961,7 @@ async fn handle_actions<Context>(
 				relay_block_hash,
 				candidate_index,
 				session,
+				executor_params,
 				candidate,
 				backing_group,
 			} => {
@@ -1000,6 +1002,7 @@ async fn handle_actions<Context>(
 										ctx,
 										metrics.clone(),
 										session,
+										executor_params,
 										candidate,
 										validator_index,
 										block_hash,
@@ -2238,6 +2241,7 @@ fn process_wakeup(
 				relay_block_hash: relay_block,
 				candidate_index: i as _,
 				session: block_entry.session(),
+				executor_params: session_info.executor_params.clone(),
 				candidate: candidate_receipt,
 				backing_group,
 			});
@@ -2271,6 +2275,7 @@ async fn launch_approval<Context>(
 	ctx: &mut Context,
 	metrics: Metrics,
 	session_index: SessionIndex,
+	executor_params: ExecutorParams,
 	candidate: CandidateReceipt,
 	validator_index: ValidatorIndex,
 	block_hash: Hash,
@@ -2399,6 +2404,7 @@ async fn launch_approval<Context>(
 				validation_code,
 				candidate.clone(),
 				available_data.pov,
+				executor_params,
 				APPROVAL_EXECUTION_TIMEOUT,
 				val_tx,
 			))

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

@@ -739,6 +739,7 @@ impl ChainBuilder {
 
 fn session_info(keys: &[Sr25519Keyring]) -> SessionInfo {
 	SessionInfo {
+		executor_params: Default::default(),
 		validators: keys.iter().map(|v| v.public().into()).collect(),
 		discovery_keys: keys.iter().map(|v| v.public().into()).collect(),
 		assignment_keys: keys.iter().map(|v| v.public().into()).collect(),
@@ -2426,7 +2427,7 @@ pub async fn handle_double_assignment_import(
 				assert_eq!(candidate_index, c_index);
 			},
 			AllMessages::CandidateValidation(
-				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, timeout, tx),
+				CandidateValidationMessage::ValidateFromExhaustive(_, _, _, _, _, timeout, tx),
 			) if timeout == APPROVAL_EXECUTION_TIMEOUT => {
 				tx.send(Ok(ValidationResult::Valid(Default::default(), Default::default())))
 					.unwrap();

node/core/backing/src/lib.rs

@@ -46,17 +46,17 @@ use polkadot_node_subsystem::{
 };
 use polkadot_node_subsystem_util::{
 	self as util, request_from_runtime, request_session_index_for_child, request_validator_groups,
-	request_validators, Validator,
+	request_validators, runtime::RuntimeInfo, Validator,
 };
 use polkadot_primitives::{
 	BackedCandidate, CandidateCommitments, CandidateHash, CandidateReceipt, CollatorId,
-	CommittedCandidateReceipt, CoreIndex, CoreState, Hash, Id as ParaId, SigningContext,
-	ValidatorId, ValidatorIndex, ValidatorSignature, ValidityAttestation,
+	CommittedCandidateReceipt, CoreIndex, CoreState, ExecutorParams, Hash, Id as ParaId,
+	SigningContext, ValidatorId, ValidatorIndex, ValidatorSignature, ValidityAttestation,
 };
 use sp_keystore::SyncCryptoStorePtr;
 use statement_table::{
 	generic::AttestedCandidate as TableAttestedCandidate,
-	v2::{
+	v3::{
 		SignedStatement as TableSignedStatement, Statement as TableStatement,
 		Summary as TableSummary,
 	},
@@ -119,14 +119,16 @@ impl ValidatedCandidateCommand {
 
 /// The candidate backing subsystem.
 pub struct CandidateBackingSubsystem {
+	runtime: RuntimeInfo,
 	keystore: SyncCryptoStorePtr,
 	metrics: Metrics,
 }
 
 impl CandidateBackingSubsystem {
 	/// Create a new instance of the `CandidateBackingSubsystem`.
 	pub fn new(keystore: SyncCryptoStorePtr, metrics: Metrics) -> Self {
-		Self { keystore, metrics }
+		let runtime = RuntimeInfo::new(Some(keystore.clone()));
+		Self { runtime, keystore, metrics }
 	}
 }
 
@@ -137,7 +139,7 @@ where
 {
 	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		let future = async move {
-			run(ctx, self.keystore, self.metrics)
+			run(ctx, self.runtime, self.keystore, self.metrics)
 				.await
 				.map_err(|e| SubsystemError::with_origin("candidate-backing", e))
 		}
@@ -150,6 +152,7 @@ where
 #[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
 async fn run<Context>(
 	mut ctx: Context,
+	mut runtime: RuntimeInfo,
 	keystore: SyncCryptoStorePtr,
 	metrics: Metrics,
 ) -> FatalResult<()> {
@@ -159,6 +162,7 @@ async fn run<Context>(
 	loop {
 		let res = run_iteration(
 			&mut ctx,
+			&mut runtime,
 			keystore.clone(),
 			&metrics,
 			&mut jobs,
@@ -179,6 +183,7 @@ async fn run<Context>(
 #[overseer::contextbounds(CandidateBacking, prefix = self::overseer)]
 async fn run_iteration<Context>(
 	ctx: &mut Context,
+	runtime: &mut RuntimeInfo,
 	keystore: SyncCryptoStorePtr,
 	metrics: &Metrics,
 	jobs: &mut HashMap<Hash, JobAndSpan<Context>>,
@@ -205,6 +210,7 @@ async fn run_iteration<Context>(
 						&mut *ctx,
 						update,
 						jobs,
+						&mut *runtime,
 						&keystore,
 						&background_validation_tx,
 						&metrics,
@@ -266,6 +272,7 @@ async fn handle_active_leaves_update<Context>(
 	ctx: &mut Context,
 	update: ActiveLeavesUpdate,
 	jobs: &mut HashMap<Hash, JobAndSpan<Context>>,
+	runtime: &mut RuntimeInfo,
 	keystore: &SyncCryptoStorePtr,
 	background_validation_tx: &mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
 	metrics: &Metrics,
@@ -319,6 +326,21 @@ async fn handle_active_leaves_update<Context>(
 	let session_index = try_runtime_api!(session_index);
 	let cores = try_runtime_api!(cores);
 
+	let ext_session_info =
+		match runtime.get_session_info_by_index(ctx.sender(), parent, session_index).await {
+			Ok(esi) => esi,
+			Err(e) => {
+				gum::warn!(
+					target: LOG_TARGET,
+					err = ?e,
+					"Failed to get session info for job",
+				);
+
+				return Ok(())
+			},
+		};
+	let executor_params = ext_session_info.session_info.executor_params.clone();
+
 	drop(_span);
 	let _span = span.child("validator-construction");
 
@@ -389,6 +411,7 @@ async fn handle_active_leaves_update<Context>(
 		unbacked_candidates: HashMap::new(),
 		backed: HashSet::new(),
 		keystore: keystore.clone(),
+		executor_params,
 		table: Table::default(),
 		table_context,
 		background_validation_tx: background_validation_tx.clone(),
@@ -428,6 +451,7 @@ struct CandidateBackingJob<Context> {
 	/// that we've sent the provisioner the backed candidate.
 	backed: HashSet<CandidateHash>,
 	keystore: SyncCryptoStorePtr,
+	executor_params: ExecutorParams,
 	table: Table<TableContext>,
 	table_context: TableContext,
 	background_validation_tx: mpsc::Sender<(Hash, ValidatedCandidateCommand)>,
@@ -643,13 +667,14 @@ async fn request_candidate_validation(
 	sender: &mut impl overseer::CandidateBackingSenderTrait,
 	candidate_receipt: CandidateReceipt,
 	pov: Arc<PoV>,
+	executor_params: ExecutorParams,
 ) -> Result<ValidationResult, Error> {
 	let (tx, rx) = oneshot::channel();
-
 	sender
 		.send_message(CandidateValidationMessage::ValidateFromChainState(
 			candidate_receipt,
 			pov,
+			executor_params,
 			BACKING_EXECUTION_TIMEOUT,
 			tx,
 		))
@@ -671,6 +696,7 @@ struct BackgroundValidationParams<S: overseer::CandidateBackingSenderTrait, F> {
 	candidate: CandidateReceipt,
 	relay_parent: Hash,
 	pov: PoVData,
+	executor_params: ExecutorParams,
 	n_validators: usize,
 	span: Option<jaeger::Span>,
 	make_command: F,
@@ -689,6 +715,7 @@ async fn validate_and_make_available(
 		relay_parent,
 		pov,
 		n_validators,
+		executor_params,
 		span,
 		make_command,
 	} = params;
@@ -729,7 +756,8 @@ async fn validate_and_make_available(
 				.with_pov(&pov)
 				.with_para_id(candidate.descriptor().para_id)
 		});
-		request_candidate_validation(&mut sender, candidate.clone(), pov.clone()).await?
+		request_candidate_validation(&mut sender, candidate.clone(), pov.clone(), executor_params)
+			.await?
 	};
 
 	let res = match v {
@@ -957,6 +985,7 @@ impl<Context> CandidateBackingJob<Context> {
 				candidate: candidate.clone(),
 				relay_parent: self.parent,
 				pov: PoVData::Ready(pov),
+				executor_params: self.executor_params.clone(),
 				n_validators: self.table_context.validators.len(),
 				span,
 				make_command: ValidatedCandidateCommand::Second,
@@ -1208,6 +1237,7 @@ impl<Context> CandidateBackingJob<Context> {
 				candidate: attesting.candidate,
 				relay_parent: self.parent,
 				pov,
+				executor_params: self.executor_params.clone(),
 				n_validators: self.table_context.validators.len(),
 				span,
 				make_command: ValidatedCandidateCommand::Attest,