mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-09 12:57:24 +00:00
fb19684358
* Add basic BABE consensus type * Update core/consensus/babe/slots/Cargo.toml Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com> * Fix parameterization and run `rustfmt` * Respond to review comments * Update various Cargo.lock files * Revert "Update various Cargo.lock files" This reverts commit af53d7624752a744320e9cbb25749fdd8e6f46d2. * `BabeSealSignature` → `BabeSeal` * Move slot code to its own crate This was highly non-trivial, due to cyclic dependencies. * Remove redundancy between AuRa and BABE Some of the code duplication was removed using a macro. * Fix build error * Avoid non-`#[doc(hidden)]` re-exports Also, bump some library versions in `Cargo.toml`. * Remove dead code in AuRa * Remove impl_slot macro It was more trouble than it was worth. Also, delete useless dependencies on Serde. * AuRa and BABE need different DB keys * Bring back `aura::Network`, but deprecate it. * Improve docs and add `slot_duration` inherent method * Add docs to `substrate_consensus_aura::SlotDuration` * Add missing documentation and #![forbid(missing_docs, unsafe_code)] * Add a #![forbid(missing_docs)] * Remove dependency of `test-runtime` on `slots` * Update core/consensus/babe/src/lib.rs Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com> * Remove wrongly added file * Fix copyright notice Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com> * Bump `impl_version` and `spec_version` * Add more code to BABE Most of it is copied from AuRa code, but at least the initial core is there. * Stuck on horrible compiler error message * add missing files * Spaces → tabs * Simplify code * Fix compilation This involved fixing dependencies and adding a `Mutex`. * More work on BABE * Fix deprecation version * Fix deprecation version; remove spurious carets * Fix Cargo.toml * Implement VRF signing logic * The import queue code compiles, though it probably doesn’t work. * Add VRF verification * Update Cargo.lock * Update dependencies * Move test network to sr25519 authority keys * Fix accidental build bustage * Trying to get the tests to work * Add logging messages and remove dead code There seems to be a problem with the test network. Since AuRa and BABE are both affected, this is most likely due to the switch from ed25519 to sr25519. * Trying to get the tests to work * Add logging messages and remove dead code There seems to be a problem with the test network. Since AuRa and BABE are both affected, this is most likely due to the switch from ed25519 to sr25519. * Working testsuite at last! The problem was with serialization and deserialization. Normally, those functions are generated automatically, but those for `BabeSeal` had to be written manually. The hand-written versions were not correct, however, as shown by the decoder not being able to decode the output of the encoder. * Enable BabeSeal::Encode asserts in --release tests * Bump runtime and dependency versions * Fix wasm compilation The wasm build was broken because of a typo in `core/test-runtime/src/lib.rs`, and missing gates on the `std` feature in `core/consensus/{aura,babe}/primitives/Cargo.toml`. Additionally, improve the quotation in the build scripts. * Merge Cargo.lock * Change expected JSON string The test was also broken on `master`, so I suspect that the test was incorrect. * Responded to review * Remove hard-coded threshold from production code A hard-coded threshold is now only used in tests. * Fix swapped doc comments * Fix unused import warnings * fix ci error * fix typo * Fix spacing in docs * Minor changes suggested by @joepetrowski on https://github.com/paritytech/substrate/pull/2372 * Remove unnecessary getters * fix compile error * Fix silly unused-variable error * Improve documentation formatting Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com> * Add issue links * Revert excess verbosity and #![forbid(warnings)] * Apply suggestions from code review Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com> * Reformat some comments * Threshold should depend on number of validators Also, respond to code review * Fix silly compilation errors * Reduce logging verbosity * Fix missing import
161 lines
4.3 KiB
Rust
161 lines
4.3 KiB
Rust
// Copyright 2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Substrate.
|
|
|
|
// Substrate is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Substrate is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Utility stream for yielding slots in a loop.
|
|
//!
|
|
//! This is used instead of `tokio_timer::Interval` because it was unreliable.
|
|
|
|
use super::SlotCompatible;
|
|
use consensus_common::{Error, ErrorKind};
|
|
use futures::prelude::*;
|
|
use futures::try_ready;
|
|
use inherents::{InherentData, InherentDataProviders};
|
|
use log::warn;
|
|
use std::marker::PhantomData;
|
|
use std::time::{Duration, Instant};
|
|
use tokio::timer::Delay;
|
|
|
|
/// Returns current duration since unix epoch.
|
|
pub fn duration_now() -> Option<Duration> {
|
|
use std::time::SystemTime;
|
|
|
|
let now = SystemTime::now();
|
|
now.duration_since(SystemTime::UNIX_EPOCH)
|
|
.map_err(|e| {
|
|
warn!(
|
|
"Current time {:?} is before unix epoch. Something is wrong: {:?}",
|
|
now, e
|
|
);
|
|
})
|
|
.ok()
|
|
}
|
|
|
|
/// Get the slot for now.
|
|
pub fn slot_now(slot_duration: u64) -> Option<u64> {
|
|
duration_now().map(|s| s.as_secs() / slot_duration)
|
|
}
|
|
|
|
/// Returns the duration until the next slot, based on current duration since
|
|
pub fn time_until_next(now: Duration, slot_duration: u64) -> Duration {
|
|
let remaining_full_secs = slot_duration - (now.as_secs() % slot_duration) - 1;
|
|
let remaining_nanos = 1_000_000_000 - now.subsec_nanos();
|
|
Duration::new(remaining_full_secs, remaining_nanos)
|
|
}
|
|
|
|
/// Information about a slot.
|
|
pub struct SlotInfo {
|
|
/// The slot number.
|
|
pub number: u64,
|
|
/// Current timestamp.
|
|
pub timestamp: u64,
|
|
/// The instant at which the slot ends.
|
|
pub ends_at: Instant,
|
|
/// The inherent data.
|
|
pub inherent_data: InherentData,
|
|
/// Slot duration.
|
|
pub duration: u64,
|
|
}
|
|
|
|
impl SlotInfo {
|
|
/// Yields the remaining duration in the slot.
|
|
pub fn remaining_duration(&self) -> Duration {
|
|
let now = Instant::now();
|
|
if now < self.ends_at {
|
|
self.ends_at.duration_since(now)
|
|
} else {
|
|
Duration::from_secs(0)
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A stream that returns every time there is a new slot.
|
|
pub struct Slots<SC> {
|
|
last_slot: u64,
|
|
slot_duration: u64,
|
|
inner_delay: Option<Delay>,
|
|
inherent_data_providers: InherentDataProviders,
|
|
_marker: PhantomData<SC>,
|
|
}
|
|
|
|
impl<SC> Slots<SC> {
|
|
/// Create a new `Slots` stream.
|
|
pub fn new(slot_duration: u64, inherent_data_providers: InherentDataProviders) -> Self {
|
|
Slots {
|
|
last_slot: 0,
|
|
slot_duration,
|
|
inner_delay: None,
|
|
inherent_data_providers,
|
|
_marker: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<SC: SlotCompatible> Stream for Slots<SC> {
|
|
type Item = SlotInfo;
|
|
type Error = Error;
|
|
|
|
fn poll(&mut self) -> Poll<Option<SlotInfo>, Self::Error> {
|
|
let slot_duration = self.slot_duration;
|
|
self.inner_delay = match self.inner_delay.take() {
|
|
None => {
|
|
// schedule wait.
|
|
let wait_until = match duration_now() {
|
|
None => return Ok(Async::Ready(None)),
|
|
Some(now) => Instant::now() + time_until_next(now, slot_duration),
|
|
};
|
|
|
|
Some(Delay::new(wait_until))
|
|
}
|
|
Some(d) => Some(d),
|
|
};
|
|
|
|
if let Some(ref mut inner_delay) = self.inner_delay {
|
|
try_ready!(inner_delay
|
|
.poll()
|
|
.map_err(|e| Error::from(ErrorKind::FaultyTimer(e))));
|
|
}
|
|
|
|
// timeout has fired.
|
|
|
|
let inherent_data = self
|
|
.inherent_data_providers
|
|
.create_inherent_data()
|
|
.map_err(crate::inherent_to_common_error)?;
|
|
let (timestamp, slot_num) = SC::extract_timestamp_and_slot(&inherent_data)?;
|
|
|
|
// reschedule delay for next slot.
|
|
let ends_at =
|
|
Instant::now() + time_until_next(Duration::from_secs(timestamp), slot_duration);
|
|
self.inner_delay = Some(Delay::new(ends_at));
|
|
|
|
// never yield the same slot twice.
|
|
if slot_num > self.last_slot {
|
|
self.last_slot = slot_num;
|
|
|
|
Ok(Async::Ready(Some(SlotInfo {
|
|
number: slot_num,
|
|
duration: self.slot_duration,
|
|
timestamp,
|
|
ends_at,
|
|
inherent_data,
|
|
})))
|
|
} else {
|
|
// re-poll until we get a new slot.
|
|
self.poll()
|
|
}
|
|
}
|
|
}
|