CompatibleDigestItem for DigestItem where
@@ -57,11 +58,11 @@ impl CompatibleDigestItem for DigestItem where
self.try_to(OpaqueDigestItemId::Seal(&AURA_ENGINE_ID))
}
- fn aura_pre_digest(slot_num: u64) -> Self {
- DigestItem::PreRuntime(AURA_ENGINE_ID, slot_num.encode())
+ fn aura_pre_digest(slot: Slot) -> Self {
+ DigestItem::PreRuntime(AURA_ENGINE_ID, slot.encode())
}
- fn as_aura_pre_digest(&self) -> Option {
+ fn as_aura_pre_digest(&self) -> Option {
self.try_to(OpaqueDigestItemId::PreRuntime(&AURA_ENGINE_ID))
}
}
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 84d3783927e54..29c4a40155166 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -43,11 +43,11 @@ use prometheus_endpoint::Registry;
use codec::{Encode, Decode, Codec};
use sp_consensus::{
- self, BlockImport, Environment, Proposer, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
- BlockOrigin, Error as ConsensusError, SelectChain, SlotData, BlockCheckParams, ImportResult
-};
-use sp_consensus::import_queue::{
- Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
+ BlockImport, Environment, Proposer, CanAuthorWith, ForkChoiceStrategy, BlockImportParams,
+ BlockOrigin, Error as ConsensusError, SelectChain, SlotData, BlockCheckParams, ImportResult,
+ import_queue::{
+ Verifier, BasicQueue, DefaultImportQueue, BoxJustificationImport,
+ },
};
use sc_client_api::{backend::AuxStore, BlockOf};
use sp_blockchain::{
@@ -57,10 +57,7 @@ use sp_blockchain::{
use sp_block_builder::BlockBuilder as BlockBuilderApi;
use sp_core::crypto::Public;
use sp_application_crypto::{AppKey, AppPublic};
-use sp_runtime::{
- generic::{BlockId, OpaqueDigestItemId},
- traits::NumberFor, Justification,
-};
+use sp_runtime::{generic::{BlockId, OpaqueDigestItemId}, traits::NumberFor, Justification};
use sp_runtime::traits::{Block as BlockT, Header, DigestItemFor, Zero, Member};
use sp_api::ProvideRuntimeApi;
use sp_core::crypto::Pair;
@@ -75,6 +72,7 @@ use sc_consensus_slots::{
CheckedHeader, SlotInfo, SlotCompatible, StorageChanges, check_equivocation,
BackoffAuthoringBlocksStrategy,
};
+use sp_consensus_slots::Slot;
use sp_api::ApiExt;
@@ -100,16 +98,16 @@ pub fn slot_duration(client: &C) -> CResult where
A: Codec,
B: BlockT,
C: AuxStore + ProvideRuntimeApi,
- C::Api: AuraApi,
+ C::Api: AuraApi,
{
- SlotDuration::get_or_compute(client, |a, b| a.slot_duration(b))
+ SlotDuration::get_or_compute(client, |a, b| a.slot_duration(b).map_err(Into::into))
}
/// Get slot author for given block along with authorities.
-fn slot_author(slot_num: u64, authorities: &[AuthorityId]) -> Option<&AuthorityId
> {
+fn slot_author(slot: Slot, authorities: &[AuthorityId]) -> Option<&AuthorityId
> {
if authorities.is_empty() { return None }
- let idx = slot_num % (authorities.len() as u64);
+ let idx = *slot % (authorities.len() as u64);
assert!(
idx <= usize::max_value() as u64,
"It is impossible to have a vector with length beyond the address space; qed",
@@ -239,7 +237,7 @@ where
fn epoch_data(
&self,
header: &B::Header,
- _slot_number: u64,
+ _slot: Slot,
) -> Result {
authorities(self.client.as_ref(), &BlockId::Hash(header.hash()))
}
@@ -251,14 +249,14 @@ where
fn claim_slot(
&self,
_header: &B::Header,
- slot_number: u64,
+ slot: Slot,
epoch_data: &Self::EpochData,
) -> Option {
- let expected_author = slot_author::(slot_number, epoch_data);
+ let expected_author = slot_author::
(slot, epoch_data);
expected_author.and_then(|p| {
if SyncCryptoStore::has_keys(
- &*self.keystore,
- &[(p.to_raw_vec(), sp_application_crypto::key_types::AURA)],
+ &*self.keystore,
+ &[(p.to_raw_vec(), sp_application_crypto::key_types::AURA)],
) {
Some(p.clone())
} else {
@@ -269,11 +267,11 @@ where
fn pre_digest_data(
&self,
- slot_number: u64,
+ slot: Slot,
_claim: &Self::Claim,
) -> Vec> {
vec![
- as CompatibleDigestItem>::aura_pre_digest(slot_number),
+ as CompatibleDigestItem>::aura_pre_digest(slot),
]
}
@@ -301,6 +299,9 @@ where
header_hash.as_ref()
).map_err(|e| sp_consensus::Error::CannotSign(
public.clone(), e.to_string(),
+ ))?
+ .ok_or_else(|| sp_consensus::Error::CannotSign(
+ public.clone(), "Could not find key in keystore.".into(),
))?;
let signature = signature.clone().try_into()
.map_err(|_| sp_consensus::Error::InvalidSignature(
@@ -323,14 +324,14 @@ where
self.force_authoring
}
- fn should_backoff(&self, slot_number: u64, chain_head: &B::Header) -> bool {
+ fn should_backoff(&self, slot: Slot, chain_head: &B::Header) -> bool {
if let Some(ref strategy) = self.backoff_authoring_blocks {
if let Ok(chain_head_slot) = find_pre_digest::(chain_head) {
return strategy.should_backoff(
*chain_head.number(),
chain_head_slot,
self.client.info().finalized_number,
- slot_number,
+ slot,
self.logging_target(),
);
}
@@ -363,9 +364,10 @@ where
if let Some(slot_lenience) =
sc_consensus_slots::slot_lenience_exponential(parent_slot, slot_info)
{
- debug!(target: "aura",
+ debug!(
+ target: "aura",
"No block for {} slots. Applying linear lenience of {}s",
- slot_info.number.saturating_sub(parent_slot + 1),
+ slot_info.slot.saturating_sub(parent_slot + 1),
slot_lenience.as_secs(),
);
@@ -401,7 +403,7 @@ enum Error