5ce249ac64
* 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() * Add CHAINID opcode * Introduce Snapshotting enum to distinguish the type of snapshots a chain uses * Rename supports_warp to snapshot_mode * Missing import * Add chain_id wherever we instantiate EnvInfo * more missing chain_id * Tell serde to ignore the chain_id field on Env * Update ethcore/src/snapshot/consensus/mod.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Use the chain_id from the machine by adding chain_id() to the Ext trait * cleanup * add missing impl cleanup * missing import * Fix import * Add transition marker for EIP 1344 * double semi * Fix merge problem * cleanup * merge conflict error * Fix a few warnings * Update ethcore/vm/src/schedule.rs Co-Authored-By: Andronik Ordian <write@reusable.software> * more merge fallout
110 lines
3.2 KiB
Rust
110 lines
3.2 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/>.
|
|
|
|
//! Environment information for transaction execution.
|
|
|
|
use std::cmp;
|
|
use std::sync::Arc;
|
|
use hash::keccak;
|
|
use ethereum_types::{U256, H256, Address};
|
|
use ethjson;
|
|
|
|
type BlockNumber = u64;
|
|
|
|
/// Simple vector of hashes, should be at most 256 items large, can be smaller if being used
|
|
/// for a block whose number is less than 257.
|
|
pub type LastHashes = Vec<H256>;
|
|
|
|
/// Information concerning the execution environment for a message-call/contract-creation.
|
|
#[derive(Debug, Clone)]
|
|
pub struct EnvInfo {
|
|
/// The block number.
|
|
pub number: BlockNumber,
|
|
/// The block author.
|
|
pub author: Address,
|
|
/// The block timestamp.
|
|
pub timestamp: u64,
|
|
/// The block difficulty.
|
|
pub difficulty: U256,
|
|
/// The block gas limit.
|
|
pub gas_limit: U256,
|
|
/// The last 256 block hashes.
|
|
pub last_hashes: Arc<LastHashes>,
|
|
/// The gas used.
|
|
pub gas_used: U256,
|
|
}
|
|
|
|
impl Default for EnvInfo {
|
|
fn default() -> Self {
|
|
EnvInfo {
|
|
number: 0,
|
|
author: Address::zero(),
|
|
timestamp: 0,
|
|
difficulty: 0.into(),
|
|
gas_limit: 0.into(),
|
|
last_hashes: Arc::new(vec![]),
|
|
gas_used: 0.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<ethjson::vm::Env> for EnvInfo {
|
|
fn from(e: ethjson::vm::Env) -> Self {
|
|
let number = e.number.into();
|
|
EnvInfo {
|
|
number,
|
|
author: e.author.into(),
|
|
difficulty: e.difficulty.into(),
|
|
gas_limit: e.gas_limit.into(),
|
|
timestamp: e.timestamp.into(),
|
|
last_hashes: Arc::new((1..cmp::min(number + 1, 257)).map(|i| keccak(format!("{}", number - i).as_bytes())).collect()),
|
|
gas_used: U256::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::str::FromStr;
|
|
use super::*;
|
|
use ethereum_types::{U256, Address};
|
|
use ethjson;
|
|
|
|
#[test]
|
|
fn it_serializes_from_json() {
|
|
let env_info = EnvInfo::from(ethjson::vm::Env {
|
|
author: ethjson::hash::Address(Address::from_str("000000f00000000f000000000000f00000000f00").unwrap()),
|
|
number: ethjson::uint::Uint(U256::from(1_112_339)),
|
|
difficulty: ethjson::uint::Uint(U256::from(50_000)),
|
|
gas_limit: ethjson::uint::Uint(U256::from(40_000)),
|
|
timestamp: ethjson::uint::Uint(U256::from(1_100))
|
|
});
|
|
|
|
assert_eq!(env_info.number, 1112339);
|
|
assert_eq!(env_info.author, Address::from_str("000000f00000000f000000000000f00000000f00").unwrap());
|
|
assert_eq!(env_info.gas_limit, 40000.into());
|
|
assert_eq!(env_info.difficulty, 50000.into());
|
|
assert_eq!(env_info.gas_used, 0.into());
|
|
}
|
|
|
|
#[test]
|
|
fn it_can_be_created_as_default() {
|
|
let default_env_info = EnvInfo::default();
|
|
|
|
assert_eq!(default_env_info.difficulty, 0.into());
|
|
}
|
|
}
|