dae5d75dd6
* cargo upgrade "ethereum-types" --all --allow-prerelease * [ethash] fix compilation errors * [ethkey] fix compilation errors * [journaldb] fix compilation errors * [dir] fix compilation errors * [ethabi] update to 0.7 * wip * [eip-712] fix compilation errors * [ethjson] fix compilation errors * [Cargo.toml] add TODO to remove patches * [ethstore] fix compilation errors * use patched keccak-hash with new primitive-types * wip * [ethcore-network-devp2p] fix compilation errors * [vm] fix compilation errors * [common-types, evm, wasm] fix compilation errors * [ethcore-db] Require AsRef instead of Deref for keys * [ethcore-blockchain] fix some compilation errors * [blooms-db] fix compilation errors Thanks a lot @dvdplm :) * we don't need no rlp ethereum feature * [ethcore] fix some compilation errors * [parity-ipfs-api] fix compilation error * [ethcore-light] fix compilation errors * [Cargo.lock] update parity-common * [ethcore-private-tx] fix some compilation errors * wip * [ethcore-private-tx] fix compilation errors * [parity-updater] fix compilation errors * [parity-rpc] fix compilation errors * [parity-bin] fix other compilation errors * update to new ethereum-types * update keccak-hash * [fastmap] fix compilation in tests * [blooms-db] fix compilation in tests * [common-types] fix compilation in tests * [triehash-ethereum] fix compilation in tests * [ethkey] fix compilation in tests * [pwasm-run-test] fix compilation errors * [wasm] fix compilation errors * [ethjson] fix compilation in tests * [eip-712] fix compilation in tests * [ethcore-blockchain] fix compilation in tests * [ethstore] fix compilation in tests * [ethstore-accounts] fix compilation in tests * [parity-hash-fetch] fix compilation in tests * [parity-whisper] fix compilation in tests * [ethcore-miner] fix compilation in tests * [ethcore-network-devp2p] fix compilation in tests * [*] upgrade rand to 0.6 * [evm] get rid of num-bigint conversions * [ethcore] downgrade trie-standardmap and criterion * [ethcore] fix some warnings * [ethcore] fix compilation in tests * [evmbin] fix compilation in tests * [updater] fix compilation in tests * [ethash] fix compilation in tests * [ethcore-secretstore] fix compilation in tests * [ethcore-sync] fix compilation in tests * [parity-rpc] fix compilation in tests * [ethcore] finally fix compilation in tests FUCK YEAH!!! * [ethstore] lazy_static is unused * [ethcore] fix test * fix up bad merge * [Cargo.toml] remove unused patches * [*] replace some git dependencies with crates.io * [Cargo.toml] remove unused lazy_static * [*] clean up * [ethcore] fix transaction_filter_deprecated test * [private-tx] fix serialization tests * fix more serialization tests * [ethkey] fix smoky test * [rpc] fix tests, please? * [ethcore] remove commented out code * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * [ethstore] remove unused dev-dependency * [ethcore] remove resolved TODO * [*] resolve keccak-hash TODO * [*] s/Address::default()/Address::zero() * [rpc] remove Subscribers::new_test * [rpc] remove EthPubSubClient::new_test * [ethcore] use trie-standardmap from crates.io * [dir] fix db_root_path * [ethcore] simplify snapshot::tests::helpers::fill_storage * Apply suggestions from code review Co-Authored-By: David <dvdplm@gmail.com> * [ethcore-secretstore] resolve TODO in serialization * [ethcore-network-devp2p] resolve TODO in save_key * [Cargo.lock] update triehash * [*] use ethabi from crates.io * [ethkey] use secp256k1 from master branch * [Cargo.lock] update eth-secp256k1
130 lines
3.8 KiB
Rust
130 lines
3.8 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/>.
|
|
|
|
use engines::{Engine, Seal, SealingState};
|
|
use machine::Machine;
|
|
use types::header::{Header, ExtendedHeader};
|
|
use block::ExecutedBlock;
|
|
|
|
/// `InstantSeal` params.
|
|
#[derive(Default, Debug, PartialEq)]
|
|
pub struct InstantSealParams {
|
|
/// Whether to use millisecond timestamp
|
|
pub millisecond_timestamp: bool,
|
|
}
|
|
|
|
impl From<::ethjson::spec::InstantSealParams> for InstantSealParams {
|
|
fn from(p: ::ethjson::spec::InstantSealParams) -> Self {
|
|
InstantSealParams {
|
|
millisecond_timestamp: p.millisecond_timestamp,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// An engine which does not provide any consensus mechanism, just seals blocks internally.
|
|
/// Only seals blocks which have transactions.
|
|
pub struct InstantSeal<M> {
|
|
params: InstantSealParams,
|
|
machine: M,
|
|
}
|
|
|
|
impl<M> InstantSeal<M> {
|
|
/// Returns new instance of InstantSeal over the given state machine.
|
|
pub fn new(params: InstantSealParams, machine: M) -> Self {
|
|
InstantSeal {
|
|
params, machine,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<M: Machine> Engine<M> for InstantSeal<M> {
|
|
fn name(&self) -> &str {
|
|
"InstantSeal"
|
|
}
|
|
|
|
fn machine(&self) -> &M { &self.machine }
|
|
|
|
fn sealing_state(&self) -> SealingState { SealingState::Ready }
|
|
|
|
fn generate_seal(&self, block: &ExecutedBlock, _parent: &Header) -> Seal {
|
|
if block.transactions.is_empty() {
|
|
Seal::None
|
|
} else {
|
|
Seal::Regular(Vec::new())
|
|
}
|
|
}
|
|
|
|
fn verify_local_seal(&self, _header: &Header) -> Result<(), M::Error> {
|
|
Ok(())
|
|
}
|
|
|
|
fn open_block_header_timestamp(&self, parent_timestamp: u64) -> u64 {
|
|
use std::{time, cmp};
|
|
|
|
let dur = time::SystemTime::now().duration_since(time::UNIX_EPOCH).unwrap_or_default();
|
|
let mut now = dur.as_secs();
|
|
if self.params.millisecond_timestamp {
|
|
now = now * 1000 + dur.subsec_millis() as u64;
|
|
}
|
|
cmp::max(now, parent_timestamp)
|
|
}
|
|
|
|
fn is_timestamp_valid(&self, header_timestamp: u64, parent_timestamp: u64) -> bool {
|
|
header_timestamp >= parent_timestamp
|
|
}
|
|
|
|
fn fork_choice(&self, new: &ExtendedHeader, current: &ExtendedHeader) -> super::ForkChoice {
|
|
super::total_difficulty_fork_choice(new, current)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::sync::Arc;
|
|
use ethereum_types::{H520, Address};
|
|
use test_helpers::get_temp_state_db;
|
|
use spec::Spec;
|
|
use types::header::Header;
|
|
use block::*;
|
|
use engines::Seal;
|
|
|
|
#[test]
|
|
fn instant_can_seal() {
|
|
let spec = Spec::new_instant();
|
|
let engine = &*spec.engine;
|
|
let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
|
|
let genesis_header = spec.genesis_header();
|
|
let last_hashes = Arc::new(vec![genesis_header.hash()]);
|
|
let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![], false, None).unwrap();
|
|
let b = b.close_and_lock().unwrap();
|
|
if let Seal::Regular(seal) = engine.generate_seal(&b, &genesis_header) {
|
|
assert!(b.try_seal(engine, seal).is_ok());
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn instant_cant_verify() {
|
|
let engine = Spec::new_instant().engine;
|
|
let mut header: Header = Header::default();
|
|
|
|
assert!(engine.verify_block_basic(&header).is_ok());
|
|
|
|
header.set_seal(vec![::rlp::encode(&H520::default())]);
|
|
|
|
assert!(engine.verify_block_unordered(&header).is_ok());
|
|
}
|
|
}
|