From 234d0df5159a7538a600dbe0bbc638436676f652 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Fri, 9 Apr 2021 00:35:23 +0200
Subject: [PATCH] no backing job early exit if not validator (#2860)
with the MaxValidators parameter set, this meant that only validators participating in parachain consensus would be able to author relay-chain blocks containing backed candidates
---
polkadot/node/core/backing/src/lib.rs | 30 ++++++++++++++-------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/polkadot/node/core/backing/src/lib.rs b/polkadot/node/core/backing/src/lib.rs
index 585bd8cee37..2dcd3a0641d 100644
--- a/polkadot/node/core/backing/src/lib.rs
+++ b/polkadot/node/core/backing/src/lib.rs
@@ -1162,11 +1162,11 @@ impl util::JobTrait for CandidateBackingJob {
let signing_context = SigningContext { parent_hash: parent, session_index };
let validator = match Validator::construct(
&validators,
- signing_context,
+ signing_context.clone(),
keystore.clone(),
).await {
- Ok(v) => v,
- Err(util::Error::NotAValidator) => { return Ok(()) },
+ Ok(v) => Some(v),
+ Err(util::Error::NotAValidator) => None,
Err(e) => {
tracing::warn!(
target: LOG_TARGET,
@@ -1186,16 +1186,18 @@ impl util::JobTrait for CandidateBackingJob {
let n_cores = cores.len();
let mut assignment = None;
- for (idx, core) in cores.into_iter().enumerate() {
- // Ignore prospective assignments on occupied cores for the time being.
- if let CoreState::Scheduled(scheduled) = core {
- let core_index = CoreIndex(idx as _);
- let group_index = group_rotation_info.group_for_core(core_index, n_cores);
- if let Some(g) = validator_groups.get(group_index.0 as usize) {
- if g.contains(&validator.index()) {
- assignment = Some((scheduled.para_id, scheduled.collator));
+ if let Some(ref validator_index) = validator.as_ref().map(|v| v.index()) {
+ for (idx, core) in cores.into_iter().enumerate() {
+ // Ignore prospective assignments on occupied cores for the time being.
+ if let CoreState::Scheduled(scheduled) = core {
+ let core_index = CoreIndex(idx as _);
+ let group_index = group_rotation_info.group_for_core(core_index, n_cores);
+ if let Some(g) = validator_groups.get(group_index.0 as usize) {
+ if g.contains(&validator_index) {
+ assignment = Some((scheduled.para_id, scheduled.collator));
+ }
+ groups.insert(scheduled.para_id, g.clone());
}
- groups.insert(scheduled.para_id, g.clone());
}
}
}
@@ -1203,8 +1205,8 @@ impl util::JobTrait for CandidateBackingJob {
let table_context = TableContext {
groups,
validators,
- signing_context: validator.signing_context().clone(),
- validator: Some(validator),
+ signing_context,
+ validator,
};
let (assignment, required_collator) = match assignment {
--
GitLab