From 000e7a800243862865bfb7a684172331c6b65bfa Mon Sep 17 00:00:00 2001
From: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>
Date: Thu, 21 Mar 2019 17:26:00 -0400
Subject: [PATCH] Make AuRa generic over cryptography (#2062)
As is so often the case in Rust, most of the work was fixing compiler
errors and removing spurious type annotations.
---
substrate/.gitignore | 2 +
substrate/core/consensus/aura/src/lib.rs | 116 +++++++++++-------
substrate/core/primitives/src/sr25519.rs | 2 +-
.../substrate_test_runtime.compact.wasm | Bin 56614 -> 56572 bytes
substrate/node-template/src/service.rs | 4 +-
substrate/node/cli/src/service.rs | 26 ++--
.../release/node_runtime.compact.wasm | Bin 901302 -> 898586 bytes
7 files changed, 88 insertions(+), 62 deletions(-)
diff --git a/substrate/.gitignore b/substrate/.gitignore
index 4caeb6cc53..21dee82d81 100644
--- a/substrate/.gitignore
+++ b/substrate/.gitignore
@@ -16,3 +16,5 @@ node/runtime/wasm/target/
polkadot.*
.DS_Store
.idea/
+nohup.out
+rls*.log
diff --git a/substrate/core/consensus/aura/src/lib.rs b/substrate/core/consensus/aura/src/lib.rs
index 064738216f..e2c1091f14 100644
--- a/substrate/core/consensus/aura/src/lib.rs
+++ b/substrate/core/consensus/aura/src/lib.rs
@@ -26,9 +26,9 @@
//! Blocks from future steps will be either deferred or rejected depending on how
//! far in the future they are.
-use std::{sync::Arc, time::Duration, thread};
+use std::{sync::Arc, time::Duration, thread, marker::PhantomData, hash::Hash, fmt::Debug};
-use parity_codec::Encode;
+use parity_codec::{Encode, Decode};
use consensus_common::{
Authorities, BlockImport, Environment, Proposer, ForkChoiceStrategy
};
@@ -41,7 +41,7 @@ use runtime_primitives::{generic, generic::BlockId, Justification};
use runtime_primitives::traits::{
Block, Header, Digest, DigestItemFor, DigestItem, ProvideRuntimeApi
};
-use primitives::{ed25519, Pair};
+use primitives::Pair;
use inherents::{InherentDataProviders, InherentData, RuntimeString};
use futures::{Stream, Future, IntoFuture, future};
@@ -60,8 +60,8 @@ pub use aura_slots::SlotDuration;
pub use aura_primitives::*;
pub use consensus_common::SyncOracle;
-type AuthorityId = ed25519::Public;
-type Signature = ed25519::Signature;
+type AuthorityId =
::Public;
+type Signature
=
::Signature;
/// A handle to the network. This is generally implemented by providing some
/// handle to a gossip service or similar.
@@ -76,7 +76,9 @@ pub trait Network: Clone {
}
/// Get slot author for given block along with authorities.
-fn slot_author(slot_num: u64, authorities: &[AuthorityId]) -> Option {
+fn slot_author(slot_num: u64, authorities: &[AuthorityId]) -> Option>
+ where P::Public: Clone,
+{
if authorities.is_empty() { return None }
let idx = slot_num % (authorities.len() as u64);
@@ -88,7 +90,7 @@ fn slot_author(slot_num: u64, authorities: &[AuthorityId]) -> Option Option {
@@ -110,25 +112,27 @@ fn inherent_to_common_error(err: RuntimeString) -> consensus_common::Error {
}
/// A digest item which is usable with aura consensus.
-pub trait CompatibleDigestItem: Sized {
+pub trait CompatibleDigestItem: Sized {
/// Construct a digest item which is a slot number and a signature on the
/// hash.
- fn aura_seal(slot_number: u64, signature: Signature) -> Self;
+ fn aura_seal(slot_number: u64, signature: Signature) -> Self;
/// If this item is an Aura seal, return the slot number and signature.
- fn as_aura_seal(&self) -> Option<(u64, Signature)>;
+ fn as_aura_seal(&self) -> Option<(u64, Signature)>;
}
-impl CompatibleDigestItem for generic::DigestItem {
+impl CompatibleDigestItem for generic::DigestItem>
+ where T::Signature: Clone
+{
/// Construct a digest item which is a slot number and a signature on the
/// hash.
- fn aura_seal(slot_number: u64, signature: Signature) -> Self {
+ fn aura_seal(slot_number: u64, signature: Signature) -> Self {
generic::DigestItem::Seal(slot_number, signature)
}
/// If this item is an Aura seal, return the slot number and signature.
- fn as_aura_seal(&self) -> Option<(u64, Signature)> {
+ fn as_aura_seal(&self) -> Option<(u64, Signature)> {
match self {
- generic::DigestItem::Seal(slot, ref sig) => Some((*slot, sig.clone().into())),
+ generic::DigestItem::Seal(slot, ref sig) => Some((*slot, (*sig).clone())),
_ => None
}
}
@@ -147,9 +151,9 @@ impl SlotCompatible for AuraSlotCompatible {
}
/// Start the aura worker in a separate thread.
-pub fn start_aura_thread(
+pub fn start_aura_thread(
slot_duration: SlotDuration,
- local_key: Arc,
+ local_key: Arc,
client: Arc,
block_import: Arc,
env: Arc,
@@ -164,9 +168,11 @@ pub fn start_aura_thread(
<>::Create as IntoFuture>::Future: Send + 'static,
I: BlockImport + Send + Sync + 'static,
Error: From + From + 'static,
+ P: Pair + Send + Sync + 'static,
+ P::Public: Encode + Decode + Eq + Clone + Debug + Hash + Send + Sync + 'static,
SO: SyncOracle + Send + Sync + Clone + 'static,
OnExit: Future + Send + 'static,
- DigestItemFor: CompatibleDigestItem + DigestItem + 'static,
+ DigestItemFor: CompatibleDigestItem + DigestItem> + 'static,
Error: ::std::error::Error + Send + From<::consensus_common::Error> + 'static,
{
let worker = AuraWorker {
@@ -184,9 +190,9 @@ pub fn start_aura_thread(
}
/// Start the aura worker. The returned future should be run in a tokio runtime.
-pub fn start_aura(
+pub fn start_aura(
slot_duration: SlotDuration,
- local_key: Arc,
+ local_key: Arc,
client: Arc,
block_import: Arc,
env: Arc,
@@ -201,8 +207,10 @@ pub fn start_aura(
<>::Create as IntoFuture>::Future: Send + 'static,
I: BlockImport + Send + Sync + 'static,
Error: From + From,
+ P: Pair + Send + Sync + 'static,
+ P::Public: Hash + Eq + Send + Sync + Clone + Debug + Encode + Decode + 'static,
SO: SyncOracle + Send + Sync + Clone,
- DigestItemFor: CompatibleDigestItem + DigestItem,
+ DigestItemFor: CompatibleDigestItem + DigestItem>,
Error: ::std::error::Error + Send + 'static + From<::consensus_common::Error>,
OnExit: Future,
{
@@ -219,24 +227,26 @@ pub fn start_aura(
)
}
-struct AuraWorker {
+struct AuraWorker {
client: Arc,
block_import: Arc,
env: Arc,
- local_key: Arc,
+ local_key: Arc,
sync_oracle: SO,
inherent_data_providers: InherentDataProviders,
}
-impl SlotWorker for AuraWorker where
+impl SlotWorker for AuraWorker where
C: Authorities,
E: Environment,
E::Proposer: Proposer,
<>::Create as IntoFuture>::Future: Send + 'static,
I: BlockImport + Send + Sync + 'static,
+ P: Pair + Send + Sync + 'static,
+ P::Public: Hash + Eq + Send + Sync + Clone + Debug + Encode + Decode + 'static,
Error: From + From,
SO: SyncOracle + Send + Clone,
- DigestItemFor: CompatibleDigestItem + DigestItem,
+ DigestItemFor: CompatibleDigestItem + DigestItem>,
Error: ::std::error::Error + Send + 'static + From<::consensus_common::Error>,
{
type OnSlot = Box + Send>;
@@ -284,10 +294,10 @@ impl SlotWorker for AuraWorker whe
);
return Box::new(future::ok(()));
}
-
- let proposal_work = match slot_author(slot_num, &authorities) {
+ let maybe_author = slot_author::(slot_num, &authorities);
+ let proposal_work = match maybe_author {
None => return Box::new(future::ok(())),
- Some(author) => if author.0 == public_key.0 {
+ Some(author) => if author == public_key {
debug!(
target: "aura", "Starting authorship at slot {}; timestamp = {}",
slot_num,
@@ -347,7 +357,7 @@ impl SlotWorker for AuraWorker whe
// add it to a digest item.
let to_sign = (slot_num, pre_hash).encode();
let signature = pair.sign(&to_sign[..]);
- let item = as CompatibleDigestItem>::aura_seal(
+ let item = as CompatibleDigestItem>::aura_seal(
slot_num,
signature,
);
@@ -391,9 +401,10 @@ impl SlotWorker for AuraWorker whe
/// if it's successful, returns the pre-header, the slot number, and the signat.
//
// FIXME #1018 needs misbehavior types
-fn check_header(slot_now: u64, mut header: B::Header, hash: B::Hash, authorities: &[AuthorityId])
- -> Result, String>
- where DigestItemFor: CompatibleDigestItem
+fn check_header(slot_now: u64, mut header: B::Header, hash: B::Hash, authorities: &[AuthorityId])
+ -> Result, String>
+ where DigestItemFor: CompatibleDigestItem,
+ P::Public: Clone + AsRef,
{
let digest_item = match header.digest_mut().pop() {
Some(x) => x,
@@ -411,16 +422,16 @@ fn check_header(slot_now: u64, mut header: B::Header, hash: B::Hash, a
// check the signature is valid under the expected authority and
// chain state.
- let expected_author = match slot_author(slot_num, &authorities) {
+ let expected_author = match slot_author::(slot_num, &authorities) {
None => return Err("Slot Author not found".to_string()),
Some(author) => author
};
let pre_hash = header.hash();
let to_sign = (slot_num, pre_hash).encode();
- let public = ed25519::Public(expected_author.0);
+ let public = expected_author;
- if ed25519::Pair::verify(&sig, &to_sign[..], public) {
+ if P::verify(&sig, &to_sign[..], public) {
Ok(CheckedHeader::Checked(header, slot_num, sig))
} else {
Err(format!("Bad signature on {:?}", hash))
@@ -442,13 +453,15 @@ pub trait ExtraVerification: Send + Sync {
}
/// A verifier for Aura blocks.
-pub struct AuraVerifier {
+pub struct AuraVerifier {
client: Arc,
extra: E,
+ phantom: PhantomData,
inherent_data_providers: inherents::InherentDataProviders,
}
-impl AuraVerifier
+impl AuraVerifier
+ where P: Send + Sync + 'static
{
fn check_inherents(
&self,
@@ -511,11 +524,13 @@ impl ExtraVerification for NothingExtra {
}
}
-impl Verifier for AuraVerifier where
+impl Verifier for AuraVerifier where
C: Authorities + ProvideRuntimeApi + Send + Sync,
C::Api: BlockBuilderApi,
- DigestItemFor: CompatibleDigestItem + DigestItem,
+ DigestItemFor: CompatibleDigestItem + DigestItem>,
E: ExtraVerification,
+ P: Pair + Send + Sync + 'static,
+ P::Public: Send + Sync + Hash + Eq + Clone + Decode + Encode + Debug + AsRef + 'static,
{
fn verify(
&self,
@@ -523,7 +538,7 @@ impl Verifier for AuraVerifier where
header: B::Header,
justification: Option,
mut body: Option>,
- ) -> Result<(ImportBlock, Option>), String> {
+ ) -> Result<(ImportBlock, Option>>), String> {
let mut inherent_data = self.inherent_data_providers.create_inherent_data().map_err(String::from)?;
let (timestamp_now, slot_now) = AuraSlotCompatible::extract_timestamp_and_slot(&inherent_data)
.map_err(|e| format!("Could not extract timestamp and slot: {:?}", e))?;
@@ -539,7 +554,7 @@ impl Verifier for AuraVerifier where
// we add one to allow for some small drift.
// FIXME #1019 in the future, alter this queue to allow deferring of headers
- let checked_header = check_header::(slot_now + 1, header, hash, &authorities[..])?;
+ let checked_header = check_header::(slot_now + 1, header, hash, &authorities[..])?;
match checked_header {
CheckedHeader::Checked(pre_header, slot_num, sig) => {
let item = >::aura_seal(slot_num, sig);
@@ -617,7 +632,7 @@ fn register_aura_inherent_data_provider(
}
/// Start an import queue for the Aura consensus algorithm.
-pub fn import_queue(
+pub fn import_queue(
slot_duration: SlotDuration,
block_import: SharedBlockImport,
justification_import: Option>,
@@ -628,13 +643,20 @@ pub fn import_queue(
B: Block,
C: 'static + Authorities + ProvideRuntimeApi + Send + Sync,
C::Api: BlockBuilderApi,
- DigestItemFor: CompatibleDigestItem + DigestItem,
+ DigestItemFor: CompatibleDigestItem + DigestItem>,
E: 'static + ExtraVerification,
+ P: Pair + Send + Sync + 'static,
+ P::Public: Clone + Eq + Send + Sync + Hash + Debug + Encode + Decode + AsRef,
{
register_aura_inherent_data_provider(&inherent_data_providers, slot_duration.get())?;
let verifier = Arc::new(
- AuraVerifier { client: client.clone(), extra, inherent_data_providers }
+ AuraVerifier {
+ client: client.clone(),
+ extra,
+ inherent_data_providers,
+ phantom: PhantomData,
+ }
);
Ok(BasicQueue::new(verifier, block_import, justification_import))
}
@@ -650,6 +672,7 @@ mod tests {
use parking_lot::Mutex;
use tokio::runtime::current_thread;
use keyring::ed25519::Keyring;
+ use primitives::ed25519;
use client::BlockchainEvents;
use test_client;
@@ -664,7 +687,7 @@ mod tests {
type Proposer = DummyProposer;
type Error = Error;
- fn init(&self, parent_header: &::Header, _authorities: &[AuthorityId])
+ fn init(&self, parent_header: &::Header, _authorities: &[AuthorityId])
-> Result
{
Ok(DummyProposer(parent_header.number + 1, self.0.clone()))
@@ -690,7 +713,7 @@ mod tests {
impl TestNetFactory for AuraTestNet {
type Specialization = DummySpecialization;
- type Verifier = AuraVerifier;
+ type Verifier = AuraVerifier;
type PeerData = ();
/// Create new test network with peers and given config.
@@ -717,6 +740,7 @@ mod tests {
client,
extra: NothingExtra,
inherent_data_providers,
+ phantom: Default::default(),
})
}
@@ -775,7 +799,7 @@ mod tests {
&inherent_data_providers, slot_duration.get()
).expect("Registers aura inherent data provider");
- let aura = start_aura(
+ let aura = start_aura::<_, _, _, _, ed25519::Pair, _, _, _>(
slot_duration,
Arc::new(key.clone().into()),
client.clone(),
diff --git a/substrate/core/primitives/src/sr25519.rs b/substrate/core/primitives/src/sr25519.rs
index ee1727b79a..a60ee94b7f 100644
--- a/substrate/core/primitives/src/sr25519.rs
+++ b/substrate/core/primitives/src/sr25519.rs
@@ -501,7 +501,7 @@ impl Pair {
#[cfg(test)]
mod test {
use super::*;
- use crate::{Pair as PairT, crypto::{Ss58Codec, DEV_PHRASE, DEV_ADDRESS}};
+ use crate::crypto::{Ss58Codec, DEV_PHRASE, DEV_ADDRESS};
use hex_literal::{hex, hex_impl};
#[test]
diff --git a/substrate/core/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm b/substrate/core/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm
index c4df3f06b5bb1e46508ff2c11a5c39a9738d6838..4f75adc74d29efaf20706fd240ba8a67443f1d70 100644
GIT binary patch
delta 9107
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
Y|NYfPp=iLb_(LHHYak
diff --git a/substrate/node-template/src/service.rs b/substrate/node-template/src/service.rs
index aa1d25963b..ae98d01de4 100644
--- a/substrate/node-template/src/service.rs
+++ b/substrate/node-template/src/service.rs
@@ -85,7 +85,7 @@ construct_service_factory! {
Self::Block,
>
{ |config: &mut FactoryFullConfiguration , client: Arc>|
- import_queue(
+ import_queue::<_, _, _, Pair>(
SlotDuration::get_or_compute(&*client)?,
client.clone(),
None,
@@ -98,7 +98,7 @@ construct_service_factory! {
Self::Block,
>
{ |config: &mut FactoryFullConfiguration, client: Arc>|
- import_queue(
+ import_queue::<_, _, _, Pair>(
SlotDuration::get_or_compute(&*client)?,
client.clone(),
None,
diff --git a/substrate/node/cli/src/service.rs b/substrate/node/cli/src/service.rs
index e2c1c67236..64f191dc4b 100644
--- a/substrate/node/cli/src/service.rs
+++ b/substrate/node/cli/src/service.rs
@@ -25,7 +25,7 @@ use client;
use consensus::{import_queue, start_aura, AuraImportQueue, SlotDuration, NothingExtra};
use grandpa;
use node_executor;
-use primitives::{Pair as PairT, ed25519::Pair};
+use primitives::{Pair as PairT, ed25519};
use node_primitives::Block;
use node_runtime::{GenesisConfig, RuntimeApi};
use substrate_service::{
@@ -76,7 +76,7 @@ construct_service_factory! {
{ |config: FactoryFullConfiguration, executor: TaskExecutor|
FullComponents::::new(config, executor) },
AuthoritySetup = {
- |mut service: Self::FullService, executor: TaskExecutor, local_key: Option>| {
+ |mut service: Self::FullService, executor: TaskExecutor, local_key: Option>| {
let (block_import, link_half) = service.config.custom.grandpa_import_setup.take()
.expect("Link Half and Block Import are present for Full Services or setup failed before. qed");
@@ -133,7 +133,7 @@ construct_service_factory! {
config.custom.grandpa_import_setup = Some((block_import.clone(), link_half));
- import_queue(
+ import_queue::<_, _, _, ed25519::Pair>(
slot_duration,
block_import,
Some(justification_import),
@@ -144,16 +144,16 @@ construct_service_factory! {
}},
LightImportQueue = AuraImportQueue
{ |config: &FactoryFullConfiguration, client: Arc>| {
- import_queue(
- SlotDuration::get_or_compute(&*client)?,
- client.clone(),
- None,
- client,
- NothingExtra,
- config.custom.inherent_data_providers.clone(),
- ).map_err(Into::into)
- }
- },
+ import_queue::<_, _, _, ed25519::Pair>(
+ SlotDuration::get_or_compute(&*client)?,
+ client.clone(),
+ None,
+ client,
+ NothingExtra,
+ config.custom.inherent_data_providers.clone(),
+ ).map_err(Into::into)
+ }
+ },
}
}
diff --git a/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm b/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm
index 446e9eaad9b7c42c8435e38f28f298bd48fa373d..5076de93a3bb3a32a54355621ba0312dd0b0880e 100644
GIT binary patch
delta 161087
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