* version: bump beta to 2.2.2 * Add experimental RPCs flag (#9928) * WiP * Enable experimental RPCs. * Keep existing blocks when restoring a Snapshot (#8643) * Rename db_restore => client * First step: make it compile! * Second step: working implementation! * Refactoring * Fix tests * PR Grumbles * PR Grumbles WIP * Migrate ancient blocks interating backward * Early return in block migration if snapshot is aborted * Remove RwLock getter (PR Grumble I) * Remove dependency on `Client`: only used Traits * Add test for recovering aborted snapshot recovery * Add test for migrating old blocks * Fix build * PR Grumble I * PR Grumble II * PR Grumble III * PR Grumble IV * PR Grumble V * PR Grumble VI * Fix one test * Fix test * PR Grumble * PR Grumbles * PR Grumbles II * Fix tests * Release RwLock earlier * Revert Cargo.lock * Update _update ancient block_ logic: set local in `commit` * Update typo in ethcore/src/snapshot/service.rs Co-Authored-By: ngotchac <ngotchac@gmail.com> * Adjust requests costs for light client (#9925) * PIP Table Cost relative to average peers instead of max peers * Add tracing in PIP new_cost_table * Update stat peer_count * Use number of leeching peers for Light serve costs * Fix test::light_params_load_share_depends_on_max_peers (wrong type) * Remove (now) useless test * Remove `load_share` from LightParams.Config Prevent div. by 0 * Add LEECHER_COUNT_FACTOR * PR Grumble: u64 to u32 for f64 casting * Prevent u32 overflow for avg_peer_count * Add tests for LightSync::Statistics * Fix empty steps (#9939) * Don't send empty step twice or empty step then block. * Perform basic validation of locally sealed blocks. * Don't include empty step twice. * prevent silent errors in daemon mode, closes #9367 (#9946) * Fix a deadlock (#9952) * Update informant: - decimal in Mgas/s - print every 5s (not randomly between 5s and 10s) * Fix dead-lock in `blockchain.rs` * Update locks ordering * Fix light client informant while syncing (#9932) * Add `is_idle` to LightSync to check importing status * Use SyncStateWrapper to make sure is_idle gets updates * Update is_major_import to use verified queue size as well * Add comment for `is_idle` * Add Debug to `SyncStateWrapper` * `fn get` -> `fn into_inner` * ci: rearrange pipeline by logic (#9970) * ci: rearrange pipeline by logic * ci: rename docs script * fix docker build (#9971) * Deny unknown fields for chainspec (#9972) * Add deny_unknown_fields to chainspec * Add tests and fix existing one * Remove serde_ignored dependency for chainspec * Fix rpc test eth chain spec * Fix starting_nonce_test spec * Improve block and transaction propagation (#9954) * Refactor sync to add priority tasks. * Send priority tasks notifications. * Propagate blocks, optimize transactions. * Implement transaction propagation. Use sync_channel. * Tone down info. * Prevent deadlock by not waiting forever for sync lock. * Fix lock order. * Don't use sync_channel to prevent deadlocks. * Fix tests. * Fix unstable peers and slowness in sync (#9967) * Don't sync all peers after each response * Update formating * Fix tests: add `continue_sync` to `Sync_step` * Update ethcore/sync/src/chain/mod.rs Co-Authored-By: ngotchac <ngotchac@gmail.com> * fix rpc middlewares * fix Cargo.lock * json: resolve merge in spec * rpc: fix starting_nonce_test * ci: allow nightl job to fail
213 lines
7.1 KiB
Rust
213 lines
7.1 KiB
Rust
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity 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 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. 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)]
|
|
pub struct Params {
|
|
/// Account start nonce, defaults to 0.
|
|
#[serde(rename="accountStartNonce")]
|
|
pub account_start_nonce: Option<Uint>,
|
|
/// Maximum size of extra data.
|
|
#[serde(rename="maximumExtraDataSize")]
|
|
pub maximum_extra_data_size: Uint,
|
|
/// Minimum gas limit.
|
|
#[serde(rename="minGasLimit")]
|
|
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.
|
|
#[serde(rename="subprotocolName")]
|
|
pub subprotocol_name: Option<String>,
|
|
|
|
/// Option fork block number to check.
|
|
#[serde(rename="forkBlock")]
|
|
pub fork_block: Option<Uint>,
|
|
/// Expected fork block hash.
|
|
#[serde(rename="forkCanonHash")]
|
|
pub fork_hash: Option<H256>,
|
|
|
|
/// See main EthashParams docs.
|
|
#[serde(rename="eip150Transition")]
|
|
pub eip150_transition: Option<Uint>,
|
|
|
|
/// See main EthashParams docs.
|
|
#[serde(rename="eip160Transition")]
|
|
pub eip160_transition: Option<Uint>,
|
|
|
|
/// See main EthashParams docs.
|
|
#[serde(rename="eip161abcTransition")]
|
|
pub eip161abc_transition: Option<Uint>,
|
|
/// See main EthashParams docs.
|
|
#[serde(rename="eip161dTransition")]
|
|
pub eip161d_transition: Option<Uint>,
|
|
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip98Transition")]
|
|
pub eip98_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip155Transition")]
|
|
pub eip155_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="validateChainIdTransition")]
|
|
pub validate_chain_id_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="validateReceiptsTransition")]
|
|
pub validate_receipts_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip140Transition")]
|
|
pub eip140_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip210Transition")]
|
|
pub eip210_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip210ContractAddress")]
|
|
pub eip210_contract_address: Option<Address>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip210ContractCode")]
|
|
pub eip210_contract_code: Option<Bytes>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip210ContractGas")]
|
|
pub eip210_contract_gas: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip211Transition")]
|
|
pub eip211_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip145Transition")]
|
|
pub eip145_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip214Transition")]
|
|
pub eip214_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip658Transition")]
|
|
pub eip658_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip1052Transition")]
|
|
pub eip1052_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="eip1283Transition")]
|
|
pub eip1283_transition: Option<Uint>,
|
|
#[serde(rename="eip1014Transition")]
|
|
pub eip1014_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="dustProtectionTransition")]
|
|
pub dust_protection_transition: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="nonceCapIncrement")]
|
|
pub nonce_cap_increment: Option<Uint>,
|
|
/// See `CommonParams` docs.
|
|
pub remove_dust_contracts : Option<bool>,
|
|
/// See `CommonParams` docs.
|
|
#[serde(rename="gasLimitBoundDivisor")]
|
|
#[serde(deserialize_with="uint::validate_non_zero")]
|
|
pub gas_limit_bound_divisor: Uint,
|
|
/// See `CommonParams` docs.
|
|
pub registrar: Option<Address>,
|
|
/// Apply reward flag
|
|
#[serde(rename="applyReward")]
|
|
pub apply_reward: Option<bool>,
|
|
/// Node permission contract address.
|
|
#[serde(rename="nodePermissionContract")]
|
|
pub node_permission_contract: Option<Address>,
|
|
/// See main EthashParams docs.
|
|
#[serde(rename="maxCodeSize")]
|
|
pub max_code_size: Option<Uint>,
|
|
/// Maximum size of transaction RLP payload.
|
|
#[serde(rename="maxTransactionSize")]
|
|
pub max_transaction_size: Option<Uint>,
|
|
/// See main EthashParams docs.
|
|
#[serde(rename="maxCodeSizeTransition")]
|
|
pub max_code_size_transition: Option<Uint>,
|
|
/// Transaction permission contract address.
|
|
#[serde(rename="transactionPermissionContract")]
|
|
pub transaction_permission_contract: Option<Address>,
|
|
/// Block at which the transaction permission contract should start being used.
|
|
#[serde(rename="transactionPermissionContractTransition")]
|
|
pub transaction_permission_contract_transition: Option<Uint>,
|
|
/// Wasm activation block height, if not activated from start
|
|
#[serde(rename="wasmActivationTransition")]
|
|
pub wasm_activation_transition: Option<Uint>,
|
|
/// KIP4 activiation block height.
|
|
#[serde(rename="kip4Transition")]
|
|
pub kip4_transition: Option<Uint>,
|
|
/// KIP6 activiation block height.
|
|
#[serde(rename="kip6Transition")]
|
|
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();
|
|
}
|
|
}
|