* 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
133 lines
4.3 KiB
Rust
133 lines
4.3 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 seal deserialization.
|
|
|
|
use hash::*;
|
|
use uint::Uint;
|
|
use bytes::Bytes;
|
|
|
|
/// Ethereum seal.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct Ethereum {
|
|
/// Seal nonce.
|
|
pub nonce: H64,
|
|
/// Seal mix hash.
|
|
pub mix_hash: H256,
|
|
}
|
|
|
|
/// AuthorityRound seal.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
pub struct AuthorityRoundSeal {
|
|
/// Seal step.
|
|
pub step: Uint,
|
|
/// Seal signature.
|
|
pub signature: H520,
|
|
}
|
|
|
|
/// Tendermint seal.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
pub struct TendermintSeal {
|
|
/// Seal round.
|
|
pub round: Uint,
|
|
/// Proposal seal signature.
|
|
pub proposal: H520,
|
|
/// Proposal seal signature.
|
|
pub precommits: Vec<H520>,
|
|
}
|
|
|
|
/// Seal variants.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub enum Seal {
|
|
/// Ethereum seal.
|
|
Ethereum(Ethereum),
|
|
/// AuthorityRound seal.
|
|
AuthorityRound(AuthorityRoundSeal),
|
|
/// Tendermint seal.
|
|
Tendermint(TendermintSeal),
|
|
/// Generic seal.
|
|
Generic(Bytes),
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use serde_json;
|
|
use hash::*;
|
|
use bytes::Bytes;
|
|
use uint::Uint;
|
|
use ethereum_types::{U256, H64 as Eth64, H256 as Eth256, H520 as Eth520};
|
|
use spec::{Ethereum, AuthorityRoundSeal, TendermintSeal, Seal};
|
|
use std::str::FromStr;
|
|
|
|
#[test]
|
|
fn seal_deserialization() {
|
|
let s = r#"[{
|
|
"ethereum": {
|
|
"nonce": "0x0000000000000042",
|
|
"mixHash": "0x1000000000000000000000000000000000000000000000000000000000000001"
|
|
}
|
|
},{
|
|
"generic": "0xe011bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa"
|
|
},{
|
|
"authorityRound": {
|
|
"step": "0x0",
|
|
"signature": "0x2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002"
|
|
}
|
|
},{
|
|
"tendermint": {
|
|
"round": "0x3",
|
|
"proposal": "0x3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",
|
|
"precommits": [
|
|
"0x4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004"
|
|
]
|
|
}
|
|
}]"#;
|
|
|
|
let deserialized: Vec<Seal> = serde_json::from_str(s).unwrap();
|
|
assert_eq!(deserialized.len(), 4);
|
|
|
|
// [0]
|
|
assert_eq!(deserialized[0], Seal::Ethereum(Ethereum {
|
|
nonce: H64(Eth64::from_str("0000000000000042").unwrap()),
|
|
mix_hash: H256(Eth256::from_str("1000000000000000000000000000000000000000000000000000000000000001").unwrap())
|
|
}));
|
|
|
|
// [1]
|
|
assert_eq!(deserialized[1], Seal::Generic(Bytes::new(vec![
|
|
0xe0, 0x11, 0xbb, 0xe8, 0xdb, 0x4e, 0x34, 0x7b, 0x4e, 0x8c, 0x93, 0x7c, 0x1c, 0x83, 0x70, 0xe4,
|
|
0xb5, 0xed, 0x33, 0xad, 0xb3, 0xdb, 0x69, 0xcb, 0xdb, 0x7a, 0x38, 0xe1, 0xe5, 0x0b, 0x1b, 0x82, 0xfa])));
|
|
|
|
// [2]
|
|
assert_eq!(deserialized[2], Seal::AuthorityRound(AuthorityRoundSeal {
|
|
step: Uint(U256::from(0x0)),
|
|
signature: H520(Eth520::from_str("2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002").unwrap())
|
|
}));
|
|
|
|
// [3]
|
|
assert_eq!(deserialized[3], Seal::Tendermint(TendermintSeal {
|
|
round: Uint(U256::from(0x3)),
|
|
proposal: H520(Eth520::from_str("3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003").unwrap()),
|
|
precommits: vec![H520(Eth520::from_str("4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004").unwrap())]
|
|
}));
|
|
}
|
|
}
|