,
/// BABE config, gotten from the runtime.
- config: Config,
+ /// NOTE: This is used to fetch `slot_duration` and `epoch_length` in the
+ /// `ConsensusDataProvider` implementation. Correct as far as these values
+ /// are not changed during an epoch change.
+ config: BabeConfiguration,
/// Authorities to be used for this babe chain.
authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
+ _phantom: PhantomData,
}
/// Verifier to be used for babe chains
@@ -96,7 +98,7 @@ where
async fn verify(
&mut self,
mut import_params: BlockImportParams,
- ) -> Result<(BlockImportParams, Option)>>), String> {
+ ) -> Result, String> {
import_params.finalized = false;
import_params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
@@ -105,7 +107,7 @@ where
let parent_hash = import_params.header.parent_hash();
let parent = self
.client
- .header(BlockId::Hash(*parent_hash))
+ .header(*parent_hash)
.ok()
.flatten()
.ok_or_else(|| format!("header for block {} not found", parent_hash))?;
@@ -114,7 +116,7 @@ where
.epoch_descriptor_for_child_of(
descendent_query(&*self.client),
&parent.hash(),
- parent.number().clone(),
+ *parent.number(),
pre_digest.slot(),
)
.map_err(|e| format!("failed to fetch epoch_descriptor: {}", e))?
@@ -122,16 +124,14 @@ where
// drop the lock
drop(epoch_changes);
- import_params.intermediates.insert(
- Cow::from(INTERMEDIATE_KEY),
- Box::new(BabeIntermediate:: { epoch_descriptor }) as Box<_>,
- );
+ import_params
+ .insert_intermediate(INTERMEDIATE_KEY, BabeIntermediate:: { epoch_descriptor });
- Ok((import_params, None))
+ Ok(import_params)
}
}
-impl BabeConsensusDataProvider
+impl BabeConsensusDataProvider
where
B: BlockT,
C: AuxStore
@@ -143,7 +143,7 @@ where
{
pub fn new(
client: Arc,
- keystore: SyncCryptoStorePtr,
+ keystore: KeystorePtr,
epoch_changes: SharedEpochChanges,
authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
) -> Result {
@@ -151,9 +151,16 @@ where
return Err(Error::StringError("Cannot supply empty authority set!".into()))
}
- let config = Config::get(&*client)?;
+ let config = sc_consensus_babe::configuration(&*client)?;
- Ok(Self { config, client, keystore, epoch_changes, authorities })
+ Ok(Self {
+ config,
+ client,
+ keystore,
+ epoch_changes,
+ authorities,
+ _phantom: Default::default(),
+ })
}
fn epoch(&self, parent: &B::Header, slot: Slot) -> Result {
@@ -162,18 +169,16 @@ where
.epoch_descriptor_for_child_of(
descendent_query(&*self.client),
&parent.hash(),
- parent.number().clone(),
+ *parent.number(),
slot,
)
.map_err(|e| Error::StringError(format!("failed to fetch epoch_descriptor: {}", e)))?
- .ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
+ .ok_or(sp_consensus::Error::InvalidAuthoritiesSet)?;
let epoch = epoch_changes
- .viable_epoch(&epoch_descriptor, |slot| {
- Epoch::genesis(self.config.genesis_config(), slot)
- })
+ .viable_epoch(&epoch_descriptor, |slot| Epoch::genesis(&self.config, slot))
.ok_or_else(|| {
- log::info!(target: "babe", "create_digest: no viable_epoch :(");
+ log::info!(target: LOG_TARGET, "create_digest: no viable_epoch :(");
sp_consensus::Error::InvalidAuthoritiesSet
})?;
@@ -181,7 +186,7 @@ where
}
}
-impl ConsensusDataProvider for BabeConsensusDataProvider
+impl ConsensusDataProvider for BabeConsensusDataProvider
where
B: BlockT,
C: AuxStore
@@ -190,8 +195,10 @@ where
+ UsageProvider
+ ProvideRuntimeApi,
C::Api: BabeApi,
+ P: Send + Sync,
{
type Transaction = TransactionFor;
+ type Proof = P;
fn create_digest(&self, parent: &B::Header, inherents: &InherentData) -> Result {
let slot = inherents
@@ -216,19 +223,19 @@ where
.epoch_descriptor_for_child_of(
descendent_query(&*self.client),
&parent.hash(),
- parent.number().clone(),
+ *parent.number(),
slot,
)
.map_err(|e| {
Error::StringError(format!("failed to fetch epoch_descriptor: {}", e))
})?
- .ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
+ .ok_or(sp_consensus::Error::InvalidAuthoritiesSet)?;
match epoch_descriptor {
ViableEpochDescriptor::Signaled(identifier, _epoch_header) => {
let epoch_mut = epoch_changes
.epoch_mut(&identifier)
- .ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
+ .ok_or(sp_consensus::Error::InvalidAuthoritiesSet)?;
// mutate the current epoch
epoch_mut.authorities = self.authorities.clone();
@@ -236,7 +243,7 @@ where
let next_epoch = ConsensusLog::NextEpochData(NextEpochDescriptor {
authorities: self.authorities.clone(),
// copy the old randomness
- randomness: epoch_mut.randomness.clone(),
+ randomness: epoch_mut.randomness,
});
vec![
@@ -259,6 +266,7 @@ where
parent: &B::Header,
params: &mut BlockImportParams,
inherents: &InherentData,
+ _proof: Self::Proof,
) -> Result<(), Error> {
let slot = inherents
.babe_inherent_data()?
@@ -268,11 +276,11 @@ where
.epoch_descriptor_for_child_of(
descendent_query(&*self.client),
&parent.hash(),
- parent.number().clone(),
+ *parent.number(),
slot,
)
.map_err(|e| Error::StringError(format!("failed to fetch epoch_descriptor: {}", e)))?
- .ok_or_else(|| sp_consensus::Error::InvalidAuthoritiesSet)?;
+ .ok_or(sp_consensus::Error::InvalidAuthoritiesSet)?;
// drop the lock
drop(epoch_changes);
// a quick check to see if we're in the authorities
@@ -281,7 +289,7 @@ where
let has_authority = epoch.authorities.iter().any(|(id, _)| *id == *authority);
if !has_authority {
- log::info!(target: "manual-seal", "authority not found");
+ log::info!(target: LOG_TARGET, "authority not found");
let timestamp = inherents
.timestamp_inherent_data()?
.ok_or_else(|| Error::StringError("No timestamp inherent data".into()))?;
@@ -295,7 +303,7 @@ where
identifier,
EpochHeader {
start_slot: slot,
- end_slot: (*slot * self.config.genesis_config().epoch_length).into(),
+ end_slot: (*slot * self.config.epoch_length).into(),
},
),
_ => unreachable!(
@@ -304,11 +312,8 @@ where
};
}
- params.intermediates.insert(
- Cow::from(INTERMEDIATE_KEY),
- Box::new(BabeIntermediate:: { epoch_descriptor }) as Box<_>,
- );
+ params.insert_intermediate(INTERMEDIATE_KEY, BabeIntermediate:: { epoch_descriptor });
Ok(())
}
-}
+}
\ No newline at end of file
diff --git a/node/consensus-transition/manual-seal/src/consensus/timestamp.rs b/node/consensus-transition/manual-seal/src/consensus/timestamp.rs
index e7f4e709..aa5c5bf9 100644
--- a/node/consensus-transition/manual-seal/src/consensus/timestamp.rs
+++ b/node/consensus-transition/manual-seal/src/consensus/timestamp.rs
@@ -1,6 +1,6 @@
// This file is part of Substrate.
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
// This program is free software: you can redistribute it and/or modify
@@ -30,10 +30,7 @@ use sp_consensus_aura::{
use sp_consensus_babe::BabeApi;
use sp_consensus_slots::{Slot, SlotDuration};
use sp_inherents::{InherentData, InherentDataProvider, InherentIdentifier};
-use sp_runtime::{
- generic::BlockId,
- traits::{Block as BlockT, Zero},
-};
+use sp_runtime::traits::{Block as BlockT, Zero};
use sp_timestamp::{InherentType, INHERENT_IDENTIFIER};
use std::{
sync::{atomic, Arc},
@@ -46,10 +43,10 @@ use std::{
/// This works by either fetching the `slot_number` from the most recent header and dividing
/// that value by `slot_duration` in order to fork chains that expect this inherent.
///
-/// It produces timestamp inherents that are increaed by `slot_duraation` whenever
+/// It produces timestamp inherents that are increased by `slot_duration` whenever
/// `provide_inherent_data` is called.
pub struct SlotTimestampProvider {
- // holds the unix millisecnd timestamp for the most recent block
+ // holds the unix millisecond timestamp for the most recent block
unix_millis: atomic::AtomicU64,
// configured slot_duration in the runtime
slot_duration: SlotDuration,
@@ -63,7 +60,7 @@ impl SlotTimestampProvider {
C: AuxStore + HeaderBackend + ProvideRuntimeApi + UsageProvider,
C::Api: BabeApi,
{
- let slot_duration = sc_consensus_babe::Config::get(&*client)?.slot_duration();
+ let slot_duration = sc_consensus_babe::configuration(&*client)?.slot_duration();
let time = Self::with_header(&client, slot_duration, |header| {
let slot_number = *sc_consensus_babe::find_pre_digest::(&header)
@@ -109,7 +106,7 @@ impl SlotTimestampProvider {
// otherwise we'd be producing blocks for older slots.
let time = if info.best_number != Zero::zero() {
let header = client
- .header(BlockId::Hash(info.best_hash))?
+ .header(info.best_hash)?
.ok_or_else(|| "best header not found in the db!".to_string())?;
let slot = func(header)?;
// add the slot duration so there's no collision of slots
@@ -141,7 +138,7 @@ impl SlotTimestampProvider {
#[async_trait::async_trait]
impl InherentDataProvider for SlotTimestampProvider {
- fn provide_inherent_data(
+ async fn provide_inherent_data(
&self,
inherent_data: &mut InherentData,
) -> Result<(), sp_inherents::Error> {
@@ -161,4 +158,4 @@ impl InherentDataProvider for SlotTimestampProvider {
) -> Option> {
None
}
-}
+}
\ No newline at end of file
diff --git a/node/runtime/src/precompiles.rs b/node/runtime/src/precompiles.rs
index d65806c6..59390048 100644
--- a/node/runtime/src/precompiles.rs
+++ b/node/runtime/src/precompiles.rs
@@ -1,10 +1,12 @@
-use pallet_evm::{Context, Precompile, PrecompileResult, PrecompileSet};
+use pallet_evm::{
+ IsPrecompileResult, Precompile, PrecompileHandle, PrecompileResult, PrecompileSet,
+};
use sp_core::H160;
use sp_std::marker::PhantomData;
-use pallet_evm_precompile_blake2::Blake2F;
-use pallet_evm_precompile_bn128::{Bn128Add, Bn128Mul, Bn128Pairing};
-use pallet_evm_precompile_curve25519::{Curve25519Add, Curve25519ScalarMul};
+use pallet_evm_precompile_blake2::Blake2F;
+use pallet_evm_precompile_bn128::{Bn128Add, Bn128Mul, Bn128Pairing};
+use pallet_evm_precompile_curve25519::{Curve25519Add, Curve25519ScalarMul};
use pallet_evm_precompile_ed25519::Ed25519Verify;
use pallet_evm_precompile_modexp::Modexp;
use pallet_evm_precompile_sha3fips::Sha3FIPS256;
@@ -19,52 +21,55 @@ where
pub fn new() -> Self {
Self(Default::default())
}
-
- pub fn used_addresses() -> sp_std::vec::Vec {
- sp_std::vec![1, 2, 3, 4, 5, 1024, 1025, 1026, 1027, 1028]
- .into_iter()
- .map(|x| hash(x))
- .collect()
+ pub fn used_addresses() -> [H160; 10] {
+ [
+ hash(1),
+ hash(2),
+ hash(3),
+ hash(4),
+ hash(5),
+ hash(1024),
+ hash(1025),
+ hash(1026),
+ hash(1027),
+ hash(1028),
+ ]
}
}
impl PrecompileSet for EdgewarePrecompiles
where
R: pallet_evm::Config,
{
- fn execute(
- &self,
- address: H160,
- input: &[u8],
- target_gas: Option,
- context: &Context,
- is_static: bool,
- ) -> Option {
- match address {
+ fn execute(&self, handle: &mut impl PrecompileHandle) -> Option {
+ match handle.code_address() {
// Ethereum precompiles :
- a if a == hash(1) => Some(ECRecover::execute(input, target_gas, context, is_static)),
- a if a == hash(2) => Some(Sha256::execute(input, target_gas, context, is_static)),
- a if a == hash(3) => Some(Ripemd160::execute(input, target_gas, context, is_static)),
- a if a == hash(4) => Some(Identity::execute(input, target_gas, context, is_static)),
- a if a == hash(5) => Some(Modexp::execute(input, target_gas, context, is_static)),
- a if a == hash(6) => Some(Bn128Add::execute(input, target_gas, context, is_static)),
- a if a == hash(7) => Some(Bn128Mul::execute(input, target_gas, context, is_static)),
- a if a == hash(8) => Some(Bn128Pairing::execute(input, target_gas, context, is_static)),
- a if a == hash(9) => Some(Blake2F::execute(input, target_gas, context, is_static)),
+ a if a == hash(1) => Some(ECRecover::execute(handle)),
+ a if a == hash(2) => Some(Sha256::execute(handle)),
+ a if a == hash(3) => Some(Ripemd160::execute(handle)),
+ a if a == hash(4) => Some(Identity::execute(handle)),
+ a if a == hash(5) => Some(Modexp::execute(handle)),
+ a if a == hash(6) => Some(Bn128Add::execute(handle)),
+ a if a == hash(7) => Some(Bn128Mul::execute(handle)),
+ a if a == hash(8) => Some(Bn128Pairing::execute(handle)),
+ a if a == hash(9) => Some(Blake2F::execute(handle)),
// Non-Frontier specific nor Ethereum precompiles :
- a if a == hash(1024) => Some(Sha3FIPS256::execute(input, target_gas, context, is_static)),
- a if a == hash(1025) => Some(ECRecoverPublicKey::execute(input, target_gas, context, is_static)),
- a if a == hash(1026) => Some(Ed25519Verify::execute(input, target_gas, context, is_static)),
- a if a == hash(1027) => Some(Curve25519Add::execute(input, target_gas, context, is_static)),
- a if a == hash(1028) => Some(Curve25519ScalarMul::execute(input, target_gas, context, is_static)),
+ a if a == hash(1024) => Some(Sha3FIPS256::execute(handle)),
+ a if a == hash(1025) => Some(ECRecoverPublicKey::execute(handle)),
+ a if a == hash(1026) => Some(Ed25519Verify::execute(handle)),
+ a if a == hash(1027) => Some(Curve25519Add::execute(handle)),
+ a if a == hash(1028) => Some(Curve25519ScalarMul::execute(handle)),
_ => None,
}
}
- fn is_precompile(&self, address: H160) -> bool {
- Self::used_addresses().contains(&address)
+ fn is_precompile(&self, address: H160, _gas: u64) -> IsPrecompileResult {
+ IsPrecompileResult::Answer {
+ is_precompile: Self::used_addresses().contains(&address),
+ extra_cost: 0,
+ }
}
}
fn hash(a: u64) -> H160 {
H160::from_low_u64_be(a)
-}
+}
\ No newline at end of file