* Add client-traits crate Move the BlockInfo trait to new crate * New crate `machine` Contains code extracted from ethcore that defines `Machine`, `Externalities` and other execution related code. * Use new machine and client-traits crates in ethcore * Use new crates machine and client-traits instead of ethcore where appropriate * Fix tests * Don't re-export so many types from ethcore::client * Fixing more fallout from removing re-export * fix test * More fallout from not re-exporting types * Add some docs * cleanup * import the macro edition style * Tweak docs * Add missing import * remove unused ethabi_derive imports * Use latest ethabi-contract * Move many traits from ethcore/client/traits to client-traits crate Initial version of extracted Engine trait * Move snapshot related traits to the engine crate (eew) * Move a few snapshot related types to common_types Cleanup Executed as exported from machine crate * fix warning * Gradually introduce new engine crate: snapshot * ethcore typechecks with new engine crate * Sort out types outside ethcore * Add an EpochVerifier to ethash and use that in Engine.epoch_verifier() Cleanup * Document pub members * Sort out tests Sort out default impls for EpochVerifier * Add test-helpers feature and move EngineSigner impl to the right place * Sort out tests * Sort out tests and refactor verification types * Fix missing traits * More missing traits Fix Histogram * Fix tests and cleanup * cleanup * Put back needed logger import * Don't rexport common_types from ethcore/src/client Don't export ethcore::client::* * Remove files no longer used Use types from the engine crate Explicit exports from engine::engine * Get rid of itertools * Move a few more traits from ethcore to client-traits: BlockChainReset, ScheduleInfo, StateClient * Move ProvingBlockChainClient to client-traits * Don't re-export ForkChoice and Transition from ethcore * Address grumbles: sort imports, remove commented out code * Fix merge resolution error * Extract the Clique engine to own crate * Extract NullEngine and the block_reward module from ethcore * Extract InstantSeal engine to own crate * Extract remaining engines * Extract executive_state to own crate so it can be used by engine crates * Remove snapshot stuff from the engine crate * Put snapshot traits back in ethcore * cleanup * Remove stuff from ethcore * Don't use itertools * itertools in aura is legit-ish * More post-merge fixes * Re-export less types in client * cleanup * Extract spec to own crate * Put back the test-helpers from basic-authority * Fix ethcore benchmarks * Reduce the public api of ethcore/verification * WIP * Add Cargo.toml * Fix compilation outside ethcore * Audit uses of import_verified_blocks() and remove unneeded calls Cleanup * cleanup * Remove unused imports from ethcore * Cleanup * remove double semi-colons * Add missing generic param * More missing generics * Update ethcore/block-reward/Cargo.toml Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update ethcore/engines/basic-authority/Cargo.toml Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update ethcore/engines/ethash/Cargo.toml Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update ethcore/engines/clique/src/lib.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * signers is already a ref * Add an EngineType enum to tighten up Engine.name() * Introduce Snapshotting enum to distinguish the type of snapshots a chain uses * Rename supports_warp to snapshot_mode * Missing import * Update ethcore/src/snapshot/consensus/mod.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * missing import * Fix import * double semi * Fix merge problem * cleanup * Parametrise `ClientIoMessage` with `()` for the light client * Add impl Tick for () * Address review feedback * Move ClientIoMessage to common-types * remove superseeded fixme * fix merge conflict errors
201 lines
5.1 KiB
Rust
201 lines
5.1 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum 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.
|
|
|
|
// Parity Ethereum 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 Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Watcher for snapshot-related chain events.
|
|
|
|
use parking_lot::Mutex;
|
|
use client::{Client, ChainNotify, NewBlocks};
|
|
use client_traits::BlockInfo;
|
|
use types::{
|
|
ids::BlockId,
|
|
io_message::ClientIoMessage,
|
|
};
|
|
|
|
use io::IoChannel;
|
|
use ethereum_types::H256;
|
|
|
|
use std::sync::Arc;
|
|
|
|
// helper trait for transforming hashes to numbers and checking if syncing.
|
|
trait Oracle: Send + Sync {
|
|
fn to_number(&self, hash: H256) -> Option<u64>;
|
|
|
|
fn is_major_importing(&self) -> bool;
|
|
}
|
|
|
|
struct StandardOracle<F> where F: 'static + Send + Sync + Fn() -> bool {
|
|
client: Arc<Client>,
|
|
sync_status: F,
|
|
}
|
|
|
|
impl<F> Oracle for StandardOracle<F>
|
|
where F: Send + Sync + Fn() -> bool
|
|
{
|
|
fn to_number(&self, hash: H256) -> Option<u64> {
|
|
self.client.block_header(BlockId::Hash(hash)).map(|h| h.number())
|
|
}
|
|
|
|
fn is_major_importing(&self) -> bool {
|
|
(self.sync_status)()
|
|
}
|
|
}
|
|
|
|
// helper trait for broadcasting a block to take a snapshot at.
|
|
trait Broadcast: Send + Sync {
|
|
fn take_at(&self, num: Option<u64>);
|
|
}
|
|
|
|
impl Broadcast for Mutex<IoChannel<ClientIoMessage<Client>>> {
|
|
fn take_at(&self, num: Option<u64>) {
|
|
let num = match num {
|
|
Some(n) => n,
|
|
None => return,
|
|
};
|
|
|
|
trace!(target: "snapshot_watcher", "broadcast: {}", num);
|
|
|
|
if let Err(e) = self.lock().send(ClientIoMessage::TakeSnapshot(num)) {
|
|
warn!("Snapshot watcher disconnected from IoService: {}", e);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A `ChainNotify` implementation which will trigger a snapshot event
|
|
/// at certain block numbers.
|
|
pub struct Watcher {
|
|
oracle: Box<dyn Oracle>,
|
|
broadcast: Box<dyn Broadcast>,
|
|
period: u64,
|
|
history: u64,
|
|
}
|
|
|
|
impl Watcher {
|
|
/// Create a new `Watcher` which will trigger a snapshot event
|
|
/// once every `period` blocks, but only after that block is
|
|
/// `history` blocks old.
|
|
pub fn new<F>(client: Arc<Client>, sync_status: F, channel: IoChannel<ClientIoMessage<Client>>, period: u64, history: u64) -> Self
|
|
where F: 'static + Send + Sync + Fn() -> bool
|
|
{
|
|
Watcher {
|
|
oracle: Box::new(StandardOracle {
|
|
client: client,
|
|
sync_status: sync_status,
|
|
}),
|
|
broadcast: Box::new(Mutex::new(channel)),
|
|
period: period,
|
|
history: history,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ChainNotify for Watcher {
|
|
fn new_blocks(&self, new_blocks: NewBlocks) {
|
|
if self.oracle.is_major_importing() || new_blocks.has_more_blocks_to_import { return }
|
|
|
|
trace!(target: "snapshot_watcher", "{} imported", new_blocks.imported.len());
|
|
|
|
let highest = new_blocks.imported.into_iter()
|
|
.filter_map(|h| self.oracle.to_number(h))
|
|
.filter(|&num| num >= self.period + self.history)
|
|
.map(|num| num - self.history)
|
|
.filter(|num| num % self.period == 0)
|
|
.fold(0, ::std::cmp::max);
|
|
|
|
match highest {
|
|
0 => self.broadcast.take_at(None),
|
|
_ => self.broadcast.take_at(Some(highest)),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::{Broadcast, Oracle, Watcher};
|
|
|
|
use client::{ChainNotify, NewBlocks, ChainRoute};
|
|
|
|
use ethereum_types::{H256, U256, BigEndianHash};
|
|
|
|
use std::collections::HashMap;
|
|
use std::time::Duration;
|
|
|
|
struct TestOracle(HashMap<H256, u64>);
|
|
|
|
impl Oracle for TestOracle {
|
|
fn to_number(&self, hash: H256) -> Option<u64> {
|
|
self.0.get(&hash).cloned()
|
|
}
|
|
|
|
fn is_major_importing(&self) -> bool { false }
|
|
}
|
|
|
|
struct TestBroadcast(Option<u64>);
|
|
impl Broadcast for TestBroadcast {
|
|
fn take_at(&self, num: Option<u64>) {
|
|
if num != self.0 {
|
|
panic!("Watcher broadcast wrong number. Expected {:?}, found {:?}", self.0, num);
|
|
}
|
|
}
|
|
}
|
|
|
|
// helper harness for tests which expect a notification.
|
|
fn harness(numbers: Vec<u64>, period: u64, history: u64, expected: Option<u64>) {
|
|
const DURATION_ZERO: Duration = Duration::from_millis(0);
|
|
|
|
let hashes: Vec<_> = numbers.clone().into_iter().map(|x| BigEndianHash::from_uint(&U256::from(x))).collect();
|
|
let map = hashes.clone().into_iter().zip(numbers).collect();
|
|
|
|
let watcher = Watcher {
|
|
oracle: Box::new(TestOracle(map)),
|
|
broadcast: Box::new(TestBroadcast(expected)),
|
|
period: period,
|
|
history: history,
|
|
};
|
|
|
|
watcher.new_blocks(NewBlocks::new(
|
|
hashes,
|
|
vec![],
|
|
ChainRoute::default(),
|
|
vec![],
|
|
vec![],
|
|
DURATION_ZERO,
|
|
false
|
|
));
|
|
}
|
|
|
|
// helper
|
|
|
|
#[test]
|
|
fn should_not_fire() {
|
|
harness(vec![0], 5, 0, None);
|
|
}
|
|
|
|
#[test]
|
|
fn fires_once_for_two() {
|
|
harness(vec![14, 15], 10, 5, Some(10));
|
|
}
|
|
|
|
#[test]
|
|
fn finds_highest() {
|
|
harness(vec![15, 25], 10, 5, Some(20));
|
|
}
|
|
|
|
#[test]
|
|
fn doesnt_fire_before_history() {
|
|
harness(vec![10, 11], 10, 5, None);
|
|
}
|
|
}
|