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
110 lines
3.8 KiB
Rust
110 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/>.
|
|
|
|
//! Authority params deserialization.
|
|
|
|
use hash::Address;
|
|
use uint::Uint;
|
|
use bytes::Bytes;
|
|
use super::ValidatorSet;
|
|
|
|
/// Authority params deserialization.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct AuthorityRoundParams {
|
|
/// Block duration, in seconds.
|
|
pub step_duration: Uint,
|
|
/// Valid authorities
|
|
pub validators: ValidatorSet,
|
|
/// Starting step. Determined automatically if not specified.
|
|
/// To be used for testing only.
|
|
pub start_step: Option<Uint>,
|
|
/// Block at which score validation should start.
|
|
pub validate_score_transition: Option<Uint>,
|
|
/// Block from which monotonic steps start.
|
|
pub validate_step_transition: Option<Uint>,
|
|
/// Whether transitions should be immediate.
|
|
pub immediate_transitions: Option<bool>,
|
|
/// Reward per block in wei.
|
|
pub block_reward: Option<Uint>,
|
|
/// Block at which the block reward contract should start being used.
|
|
pub block_reward_contract_transition: Option<Uint>,
|
|
/// Block reward contract address (setting the block reward contract
|
|
/// overrides the static block reward definition).
|
|
pub block_reward_contract_address: Option<Address>,
|
|
/// Block reward code. This overrides the block reward contract address.
|
|
pub block_reward_contract_code: Option<Bytes>,
|
|
/// Block at which maximum uncle count should be considered.
|
|
pub maximum_uncle_count_transition: Option<Uint>,
|
|
/// Maximum number of accepted uncles.
|
|
pub maximum_uncle_count: Option<Uint>,
|
|
/// Block at which empty step messages should start.
|
|
pub empty_steps_transition: Option<Uint>,
|
|
/// Maximum number of accepted empty steps.
|
|
pub maximum_empty_steps: Option<Uint>,
|
|
/// Strict validation of empty steps transition block.
|
|
pub strict_empty_steps_transition: Option<Uint>,
|
|
}
|
|
|
|
/// Authority engine deserialization.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
pub struct AuthorityRound {
|
|
/// Ethash params.
|
|
pub params: AuthorityRoundParams,
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use ethereum_types::{U256, H160};
|
|
use uint::Uint;
|
|
use serde_json;
|
|
use hash::Address;
|
|
use spec::validator_set::ValidatorSet;
|
|
use spec::authority_round::AuthorityRound;
|
|
use std::str::FromStr;
|
|
|
|
#[test]
|
|
fn authority_round_deserialization() {
|
|
let s = r#"{
|
|
"params": {
|
|
"stepDuration": "0x02",
|
|
"validators": {
|
|
"list" : ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
|
|
},
|
|
"startStep" : 24,
|
|
"validateStepTransition": 150,
|
|
"blockReward": 5000000,
|
|
"maximumUncleCountTransition": 10000000,
|
|
"maximumUncleCount": 5
|
|
}
|
|
}"#;
|
|
|
|
let deserialized: AuthorityRound = serde_json::from_str(s).unwrap();
|
|
assert_eq!(deserialized.params.step_duration, Uint(U256::from(0x02)));
|
|
assert_eq!(
|
|
deserialized.params.validators,
|
|
ValidatorSet::List(vec![Address(H160::from_str("c6d9d2cd449a754c494264e1809c50e34d64562b").unwrap())]),
|
|
);
|
|
assert_eq!(deserialized.params.start_step, Some(Uint(U256::from(24))));
|
|
assert_eq!(deserialized.params.immediate_transitions, None);
|
|
assert_eq!(deserialized.params.maximum_uncle_count_transition, Some(Uint(10_000_000.into())));
|
|
assert_eq!(deserialized.params.maximum_uncle_count, Some(Uint(5.into())));
|
|
|
|
}
|
|
}
|