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
246 lines
7.5 KiB
Rust
246 lines
7.5 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/>.
|
|
|
|
use std::fmt;
|
|
use std::ops::Deref;
|
|
use rustc_hex::{self, FromHex};
|
|
use serde::{Serialize, Deserialize, Serializer, Deserializer};
|
|
use serde::de::{Visitor, Error as SerdeError};
|
|
use ethkey::{Public, Secret, Signature};
|
|
use ethereum_types::{H160, H256};
|
|
use bytes::Bytes;
|
|
use types::Requester;
|
|
|
|
trait ToHex {
|
|
fn to_hex(&self) -> String;
|
|
}
|
|
|
|
impl ToHex for Bytes {
|
|
fn to_hex(&self) -> String {
|
|
format!("0x{}", rustc_hex::ToHex::to_hex(&self[..]))
|
|
}
|
|
}
|
|
|
|
impl ToHex for Signature {
|
|
fn to_hex(&self) -> String {
|
|
format!("0x{}", self)
|
|
}
|
|
}
|
|
|
|
impl ToHex for Secret {
|
|
fn to_hex(&self) -> String {
|
|
format!("0x{}", rustc_hex::ToHex::to_hex(self))
|
|
}
|
|
}
|
|
|
|
macro_rules! impl_to_hex {
|
|
($name: ident) => (
|
|
impl ToHex for $name {
|
|
fn to_hex(&self) -> String {
|
|
format!("{:#x}", self)
|
|
}
|
|
}
|
|
);
|
|
}
|
|
|
|
macro_rules! impl_bytes_deserialize {
|
|
($name: ident, $value: expr, true) => {
|
|
$value[2..].from_hex().map($name).map_err(SerdeError::custom)
|
|
};
|
|
($name: ident, $value: expr, false) => {
|
|
$value[2..].parse().map($name).map_err(SerdeError::custom)
|
|
}
|
|
}
|
|
|
|
macro_rules! impl_bytes {
|
|
($name: ident, $other: ident, $from_hex: ident, ($($trait: ident),*)) => {
|
|
#[derive(Clone, Debug, PartialEq, Eq, $($trait,)*)]
|
|
pub struct $name(pub $other);
|
|
|
|
impl<T> From<T> for $name where $other: From<T> {
|
|
fn from(s: T) -> $name {
|
|
$name(s.into())
|
|
}
|
|
}
|
|
|
|
impl Into<$other> for $name {
|
|
fn into(self) -> $other {
|
|
self.0
|
|
}
|
|
}
|
|
|
|
impl Deref for $name {
|
|
type Target = $other;
|
|
|
|
fn deref(&self) -> &$other {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl Serialize for $name {
|
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
|
|
serializer.serialize_str(self.0.to_hex().as_ref())
|
|
}
|
|
}
|
|
|
|
impl<'a> Deserialize<'a> for $name {
|
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'a> {
|
|
struct HexBytesVisitor;
|
|
|
|
impl<'b> Visitor<'b> for HexBytesVisitor {
|
|
type Value = $name;
|
|
|
|
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
|
|
write!(formatter, "a hex-encoded bytes string")
|
|
}
|
|
|
|
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
|
|
if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
|
|
impl_bytes_deserialize!($name, value, $from_hex)
|
|
} else {
|
|
Err(SerdeError::custom("invalid format"))
|
|
}
|
|
}
|
|
|
|
fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
|
|
self.visit_str(value.as_ref())
|
|
}
|
|
}
|
|
|
|
deserializer.deserialize_any(HexBytesVisitor)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Serializable message hash.
|
|
pub type SerializableMessageHash = SerializableH256;
|
|
/// Serializable address;
|
|
pub type SerializableAddress = SerializableH160;
|
|
|
|
impl_to_hex!(H256);
|
|
impl_to_hex!(H160);
|
|
impl_to_hex!(Public);
|
|
|
|
impl_bytes!(SerializableBytes, Bytes, true, (Default));
|
|
impl_bytes!(SerializableH256, H256, false, (Default, PartialOrd, Ord));
|
|
impl_bytes!(SerializableH160, H160, false, (Default));
|
|
impl_bytes!(SerializablePublic, Public, false, (Default, PartialOrd, Ord));
|
|
impl_bytes!(SerializableSecret, Secret, false, ());
|
|
impl_bytes!(SerializableSignature, Signature, false, ());
|
|
|
|
/// Serializable shadow decryption result.
|
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
|
pub struct SerializableEncryptedDocumentKeyShadow {
|
|
/// Decrypted secret point. It is partially decrypted if shadow decryption was requested.
|
|
pub decrypted_secret: SerializablePublic,
|
|
/// Shared common point.
|
|
pub common_point: SerializablePublic,
|
|
/// If shadow decryption was requested: shadow decryption coefficients, encrypted with requestor public.
|
|
pub decrypt_shadows: Vec<SerializableBytes>,
|
|
}
|
|
|
|
/// Serializable requester identification data.
|
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
|
pub enum SerializableRequester {
|
|
/// Requested with server key id signature.
|
|
Signature(SerializableSignature),
|
|
/// Requested with public key.
|
|
Public(SerializablePublic),
|
|
/// Requested with verified address.
|
|
Address(SerializableAddress),
|
|
}
|
|
|
|
impl From<SerializableRequester> for Requester {
|
|
fn from(requester: SerializableRequester) -> Requester {
|
|
match requester {
|
|
SerializableRequester::Signature(signature) => Requester::Signature(signature.into()),
|
|
SerializableRequester::Public(public) => Requester::Public(public.into()),
|
|
SerializableRequester::Address(address) => Requester::Address(address.into()),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<Requester> for SerializableRequester {
|
|
fn from(requester: Requester) -> SerializableRequester {
|
|
match requester {
|
|
Requester::Signature(signature) => SerializableRequester::Signature(signature.into()),
|
|
Requester::Public(public) => SerializableRequester::Public(public.into()),
|
|
Requester::Address(address) => SerializableRequester::Address(address.into()),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use serde_json;
|
|
use super::*;
|
|
use std::str::FromStr;
|
|
|
|
macro_rules! do_test {
|
|
($value: expr, $expected: expr, $expected_type: ident) => (
|
|
let serialized = serde_json::to_string(&$value).unwrap();
|
|
assert_eq!(serialized, $expected);
|
|
let deserialized: $expected_type = serde_json::from_str(&serialized).unwrap();
|
|
assert_eq!(deserialized, $value);
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_and_deserialize_bytes() {
|
|
do_test!(SerializableBytes(vec![1, 2, 3, 4]), "\"0x01020304\"".to_owned(), SerializableBytes);
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_and_deserialize_h256() {
|
|
let s = "5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae";
|
|
let h256 = SerializableH256(H256::from_str(s).unwrap());
|
|
do_test!(h256, format!("\"0x{}\"", s), SerializableH256);
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_and_deserialize_h160() {
|
|
let s = "c6d9d2cd449a754c494264e1809c50e34d64562b";
|
|
let h160 = SerializableH160(H160::from_str(s).unwrap());
|
|
do_test!(h160, format!("\"0x{}\"", s), SerializableH160);
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_and_deserialize_public() {
|
|
let s = "cac6c205eb06c8308d65156ff6c862c62b000b8ead121a4455a8ddeff7248128d895692136f240d5d1614dc7cc4147b1bd584bd617e30560bb872064d09ea325";
|
|
let public = SerializablePublic(s.parse().unwrap());
|
|
do_test!(public, format!("\"0x{}\"", s), SerializablePublic);
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_and_deserialize_secret() {
|
|
let s = "5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae";
|
|
let secret = SerializableSecret(Secret::from(s));
|
|
do_test!(secret, format!("\"0x{}\"", s), SerializableSecret);
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_and_deserialize_signature() {
|
|
let raw_r = "afafafafafafafafafafafbcbcbcbcbcbcbcbcbcbeeeeeeeeeeeeedddddddddd";
|
|
let raw_s = "5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae";
|
|
let r = H256::from_str(raw_r).unwrap();
|
|
let s = H256::from_str(raw_s).unwrap();
|
|
let v = 42u8;
|
|
let public = SerializableSignature(Signature::from_rsv(&r, &s, v));
|
|
do_test!(public, format!("\"0x{}{}{:x}\"", raw_r, raw_s, v), SerializableSignature);
|
|
}
|
|
}
|