pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-27 08:11:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Parent Hash to Session mapping (#928)

Browse Source 
* Adds a SigningContext type

* Bump spec versions

* Fixes requested changes

* Bump ParachainHost api_version and guard signing_context call

* Improve error message

* If there is no signing_context api use default value

Co-authored-by: Robert Habermeier <rphmeier@gmail.com>
This commit is contained in:
Fedor Sakharov
2020-03-26 00:04:05 +03:00
committed by GitHub
parent 62cddd6fcb
commit dbb4e987fa
15 changed files with 252 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/validation/src/shared_table/mod.rs
+52 -19
View File
@@ -25,7 +25,7 @@ use table::{self, Table, Context as TableContextTrait};
use polkadot_primitives::{Block, Hash};
use polkadot_primitives::parachain::{
Id as ParaId, AbridgedCandidateReceipt, ValidatorPair, ValidatorId,
AttestedCandidate, ParachainHost, PoVBlock, ValidatorIndex,
AttestedCandidate, ParachainHost, PoVBlock, ValidatorIndex, SigningContext,
};
use parking_lot::Mutex;
@@ -48,7 +48,7 @@ pub use table::{SignedStatement, Statement};
pub use table::generic::Statement as GenericStatement;
struct TableContext {
parent_hash: Hash,
signing_context: SigningContext,
key: Option<Arc<ValidatorPair>>,
groups: HashMap<ParaId, GroupInfo>,
validators: Vec<ValidatorId>,
@@ -87,7 +87,12 @@ impl TableContext {
fn sign_statement(&self, statement: table::Statement) -> Option<table::SignedStatement> {
self.local_index().and_then(move |sender|
self.key.as_ref()
.map(|key| crate::sign_table_statement(&statement, key, &self.parent_hash).into())
.map(|key| crate::sign_table_statement(
&statement,
key,
&self.signing_context,
).into()
)
.map(move |signature| table::SignedStatement { statement, signature, sender })
)
}
@@ -189,7 +194,7 @@ impl SharedTableInner {
work.map(|work| ParachainWork {
availability_store: self.availability_store.clone(),
relay_parent: context.parent_hash.clone(),
relay_parent: context.signing_context.parent_hash.clone(),
work,
max_block_data_size,
n_validators: context.validators.len(),
@@ -408,12 +413,12 @@ impl SharedTable {
validators: Vec<ValidatorId>,
groups: HashMap<ParaId, GroupInfo>,
key: Option<Arc<ValidatorPair>>,
parent_hash: Hash,
signing_context: SigningContext,
availability_store: AvailabilityStore,
max_block_data_size: Option<u64>,
) -> Self {
SharedTable {
context: Arc::new(TableContext { groups, key, parent_hash, validators: validators.clone(), }),
context: Arc::new(TableContext { groups, key, signing_context, validators: validators.clone(), }),
max_block_data_size,
inner: Arc::new(Mutex::new(SharedTableInner {
table: Table::default(),
@@ -425,8 +430,8 @@ impl SharedTable {
}
/// Get the parent hash this table should hold statements localized to.
pub fn consensus_parent_hash(&self) -> &Hash {
&self.context.parent_hash
pub fn signing_context(&self) -> &SigningContext {
&self.context.signing_context
}
/// Get the local validator session key.
@@ -654,7 +659,11 @@ mod tests {
let mut groups = HashMap::new();
let para_id = ParaId::from(1);
let parent_hash = Default::default();
let parent_hash = Hash::default();
let signing_context = SigningContext {
session_index: Default::default(),
parent_hash: parent_hash.clone(),
};
let local_key = Sr25519Keyring::Alice.pair();
let local_id: ValidatorId = local_key.public().into();
@@ -673,7 +682,7 @@ mod tests {
[local_id, validity_other].to_vec(),
groups,
Some(local_key.clone()),
parent_hash,
signing_context.clone(),
AvailabilityStore::new_in_memory(DummyErasureNetworking),
None,
);
@@ -684,7 +693,11 @@ mod tests {
let candidate_statement = GenericStatement::Candidate(candidate);
let signature = crate::sign_table_statement(&candidate_statement, &validity_other_key.into(), &parent_hash);
let signature = crate::sign_table_statement(
&candidate_statement,
&validity_other_key.into(),
&signing_context,
);
let signed_statement = ::table::generic::SignedStatement {
statement: candidate_statement,
signature: signature.into(),
@@ -702,7 +715,11 @@ mod tests {
let mut groups = HashMap::new();
let para_id = ParaId::from(1);
let parent_hash = Default::default();
let parent_hash = Hash::default();
let signing_context = SigningContext {
session_index: Default::default(),
parent_hash: parent_hash.clone(),
};
let local_key = Sr25519Keyring::Alice.pair();
let local_id: ValidatorId = local_key.public().into();
@@ -721,7 +738,7 @@ mod tests {
[local_id, validity_other].to_vec(),
groups,
Some(local_key.clone()),
parent_hash,
signing_context.clone(),
AvailabilityStore::new_in_memory(DummyErasureNetworking),
None,
);
@@ -732,7 +749,11 @@ mod tests {
let candidate_statement = GenericStatement::Candidate(candidate);
let signature = crate::sign_table_statement(&candidate_statement, &validity_other_key.into(), &parent_hash);
let signature = crate::sign_table_statement(
&candidate_statement,
&validity_other_key.into(),
&signing_context,
);
let signed_statement = ::table::generic::SignedStatement {
statement: candidate_statement,
signature: signature.into(),
@@ -874,7 +895,11 @@ mod tests {
let mut groups = HashMap::new();
let para_id = ParaId::from(1);
let parent_hash = Default::default();
let parent_hash = Hash::default();
let signing_context = SigningContext {
session_index: Default::default(),
parent_hash: parent_hash.clone(),
};
let local_key = Sr25519Keyring::Alice.pair();
let local_id: ValidatorId = local_key.public().into();
@@ -893,7 +918,7 @@ mod tests {
[local_id, validity_other].to_vec(),
groups,
Some(local_key.clone()),
parent_hash,
signing_context.clone(),
AvailabilityStore::new_in_memory(DummyErasureNetworking),
None,
);
@@ -905,7 +930,11 @@ mod tests {
let candidate_hash = candidate.hash();
let candidate_statement = GenericStatement::Candidate(candidate);
let signature = crate::sign_table_statement(&candidate_statement, &validity_other_key.into(), &parent_hash);
let signature = crate::sign_table_statement(
&candidate_statement,
&validity_other_key.into(),
&signing_context,
);
let signed_statement = ::table::generic::SignedStatement {
statement: candidate_statement,
signature: signature.into(),
@@ -934,7 +963,11 @@ mod tests {
let para_id = ParaId::from(1);
let pov_block = pov_block_with_data(vec![1, 2, 3]);
let parent_hash = Default::default();
let parent_hash = Hash::default();
let signing_context = SigningContext {
session_index: Default::default(),
parent_hash: parent_hash.clone(),
};
let local_key = Sr25519Keyring::Alice.pair();
let local_id: ValidatorId = local_key.public().into();
@@ -952,7 +985,7 @@ mod tests {
[local_id, validity_other].to_vec(),
groups,
Some(local_key.clone()),
parent_hash,
signing_context.clone(),
AvailabilityStore::new_in_memory(DummyErasureNetworking),
None,
);