dabfa2c663
* 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 * reprice SLOAD to 800 gas * Reprice BALANCE and EXTCODEHASH * Add SELFBALANCE opcode * Add test for SELFBALANCE Use InstructionParams.address as the self-address * Use easier to read values in test * merge conflict error * Fix a few warnings * Update ethcore/vm/src/schedule.rs Co-Authored-By: Andronik Ordian <write@reusable.software> * more merge fallout
187 lines
6.1 KiB
Rust
187 lines
6.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/>.
|
|
|
|
//! Spec params deserialization.
|
|
|
|
use uint::{self, Uint};
|
|
use hash::{H256, Address};
|
|
use bytes::Bytes;
|
|
|
|
/// Spec params.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct Params {
|
|
/// Account start nonce, defaults to 0.
|
|
pub account_start_nonce: Option<Uint>,
|
|
/// Maximum size of extra data.
|
|
pub maximum_extra_data_size: Uint,
|
|
/// Minimum gas limit.
|
|
pub min_gas_limit: Uint,
|
|
|
|
/// Network id.
|
|
#[serde(rename = "networkID")]
|
|
pub network_id: Uint,
|
|
/// Chain id.
|
|
#[serde(rename = "chainID")]
|
|
pub chain_id: Option<Uint>,
|
|
|
|
/// Name of the main ("eth") subprotocol.
|
|
pub subprotocol_name: Option<String>,
|
|
|
|
/// Option fork block number to check.
|
|
pub fork_block: Option<Uint>,
|
|
/// Expected fork block hash.
|
|
#[serde(rename = "forkCanonHash")]
|
|
pub fork_hash: Option<H256>,
|
|
|
|
/// See main EthashParams docs.
|
|
pub eip150_transition: Option<Uint>,
|
|
|
|
/// See main EthashParams docs.
|
|
pub eip160_transition: Option<Uint>,
|
|
|
|
/// See main EthashParams docs.
|
|
pub eip161abc_transition: Option<Uint>,
|
|
/// See main EthashParams docs.
|
|
pub eip161d_transition: Option<Uint>,
|
|
|
|
/// See `CommonParams` docs.
|
|
pub eip98_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip155_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub validate_chain_id_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub validate_receipts_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip140_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip210_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip210_contract_address: Option<Address>,
|
|
/// See `CommonParams` docs.
|
|
pub eip210_contract_code: Option<Bytes>,
|
|
/// See `CommonParams` docs.
|
|
pub eip210_contract_gas: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip211_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip145_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip214_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip658_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip1052_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip1283_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip1283_disable_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip1014_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip1344_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip1884_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub eip2028_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub dust_protection_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub nonce_cap_increment: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub remove_dust_contracts : Option<bool>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(deserialize_with="uint::validate_non_zero")]
|
|
pub gas_limit_bound_divisor: Uint,
|
|
/// See `CommonParams` docs.
|
|
pub registrar: Option<Address>,
|
|
/// Apply reward flag
|
|
pub apply_reward: Option<bool>,
|
|
/// Node permission contract address.
|
|
pub node_permission_contract: Option<Address>,
|
|
/// See main EthashParams docs.
|
|
pub max_code_size: Option<Uint>,
|
|
/// Maximum size of transaction RLP payload.
|
|
pub max_transaction_size: Option<Uint>,
|
|
/// See main EthashParams docs.
|
|
pub max_code_size_transition: Option<Uint>,
|
|
/// Transaction permission contract address.
|
|
pub transaction_permission_contract: Option<Address>,
|
|
/// Block at which the transaction permission contract should start being used.
|
|
pub transaction_permission_contract_transition: Option<Uint>,
|
|
/// Wasm activation block height, if not activated from start.
|
|
pub wasm_activation_transition: Option<Uint>,
|
|
/// Define a separate wasm version instead of using the prefix.
|
|
pub wasm_version: Option<Uint>,
|
|
/// KIP4 activiation block height.
|
|
pub kip4_transition: Option<Uint>,
|
|
/// KIP6 activiation block height.
|
|
pub kip6_transition: Option<Uint>,
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use serde_json;
|
|
use uint::Uint;
|
|
use ethereum_types::U256;
|
|
use spec::params::Params;
|
|
|
|
#[test]
|
|
fn params_deserialization() {
|
|
let s = r#"{
|
|
"maximumExtraDataSize": "0x20",
|
|
"networkID" : "0x1",
|
|
"chainID" : "0x15",
|
|
"subprotocolName" : "exp",
|
|
"minGasLimit": "0x1388",
|
|
"accountStartNonce": "0x01",
|
|
"gasLimitBoundDivisor": "0x20",
|
|
"maxCodeSize": "0x1000",
|
|
"wasmActivationTransition": "0x1010"
|
|
}"#;
|
|
|
|
let deserialized: Params = serde_json::from_str(s).unwrap();
|
|
assert_eq!(deserialized.maximum_extra_data_size, Uint(U256::from(0x20)));
|
|
assert_eq!(deserialized.network_id, Uint(U256::from(0x1)));
|
|
assert_eq!(deserialized.chain_id, Some(Uint(U256::from(0x15))));
|
|
assert_eq!(deserialized.subprotocol_name, Some("exp".to_owned()));
|
|
assert_eq!(deserialized.min_gas_limit, Uint(U256::from(0x1388)));
|
|
assert_eq!(deserialized.account_start_nonce, Some(Uint(U256::from(0x01))));
|
|
assert_eq!(deserialized.gas_limit_bound_divisor, Uint(U256::from(0x20)));
|
|
assert_eq!(deserialized.max_code_size, Some(Uint(U256::from(0x1000))));
|
|
assert_eq!(deserialized.wasm_activation_transition, Some(Uint(U256::from(0x1010))));
|
|
}
|
|
|
|
#[test]
|
|
#[should_panic(expected = "a non-zero value")]
|
|
fn test_zero_value_divisor() {
|
|
let s = r#"{
|
|
"maximumExtraDataSize": "0x20",
|
|
"networkID" : "0x1",
|
|
"chainID" : "0x15",
|
|
"subprotocolName" : "exp",
|
|
"minGasLimit": "0x1388",
|
|
"accountStartNonce": "0x01",
|
|
"gasLimitBoundDivisor": "0x0",
|
|
"maxCodeSize": "0x1000"
|
|
}"#;
|
|
|
|
let _deserialized: Params = serde_json::from_str(s).unwrap();
|
|
}
|
|
}
|