fbf425c4e2
* 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 * 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
65 lines
2.0 KiB
Rust
65 lines
2.0 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 ethereum_types::{H256, U256, Address};
|
|
use ethjson;
|
|
use keccak_hash::KECCAK_NULL_RLP;
|
|
use crate::seal::Seal;
|
|
|
|
/// Genesis components.
|
|
pub struct Genesis {
|
|
/// Seal.
|
|
pub seal: Seal,
|
|
/// Difficulty.
|
|
pub difficulty: U256,
|
|
/// Author.
|
|
pub author: Address,
|
|
/// Timestamp.
|
|
pub timestamp: u64,
|
|
/// Parent hash.
|
|
pub parent_hash: H256,
|
|
/// Gas limit.
|
|
pub gas_limit: U256,
|
|
/// Transactions root.
|
|
pub transactions_root: H256,
|
|
/// Receipts root.
|
|
pub receipts_root: H256,
|
|
/// State root.
|
|
pub state_root: Option<H256>,
|
|
/// Gas used.
|
|
pub gas_used: U256,
|
|
/// Extra data.
|
|
pub extra_data: Vec<u8>,
|
|
}
|
|
|
|
impl From<ethjson::spec::Genesis> for Genesis {
|
|
fn from(g: ethjson::spec::Genesis) -> Self {
|
|
Genesis {
|
|
seal: From::from(g.seal),
|
|
difficulty: g.difficulty.into(),
|
|
author: g.author.map_or_else(Address::zero, Into::into),
|
|
timestamp: g.timestamp.map_or(0, Into::into),
|
|
parent_hash: g.parent_hash.map_or_else(H256::zero, Into::into),
|
|
gas_limit: g.gas_limit.into(),
|
|
transactions_root: g.transactions_root.map_or_else(|| KECCAK_NULL_RLP.clone(), Into::into),
|
|
receipts_root: g.receipts_root.map_or_else(|| KECCAK_NULL_RLP.clone(), Into::into),
|
|
state_root: g.state_root.map(Into::into),
|
|
gas_used: g.gas_used.map_or_else(U256::zero, Into::into),
|
|
extra_data: g.extra_data.map_or_else(Vec::new, Into::into),
|
|
}
|
|
}
|
|
}
|