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
120 lines
3.2 KiB
Rust
120 lines
3.2 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 ethereum_types::{H256, U256, Address, BigEndianHash};
|
|
use bytes::Bytes;
|
|
use hash::keccak;
|
|
use rlp::Encodable;
|
|
use ethkey::Signature;
|
|
use types::transaction::signature::{add_chain_replay_protection, check_replay_protection};
|
|
|
|
/// Message with private transaction encrypted
|
|
#[derive(Default, Debug, Clone, PartialEq, RlpEncodable, RlpDecodable, Eq)]
|
|
pub struct PrivateTransaction {
|
|
/// Encrypted data
|
|
encrypted: Bytes,
|
|
/// Address of the contract
|
|
contract: Address,
|
|
/// Hash
|
|
hash: H256,
|
|
}
|
|
|
|
impl PrivateTransaction {
|
|
/// Constructor
|
|
pub fn new(encrypted: Bytes, contract: Address) -> Self {
|
|
PrivateTransaction {
|
|
encrypted,
|
|
contract,
|
|
hash: H256::zero(),
|
|
}.compute_hash()
|
|
}
|
|
|
|
fn compute_hash(mut self) -> PrivateTransaction {
|
|
self.hash = keccak(&*self.rlp_bytes());
|
|
self
|
|
}
|
|
|
|
/// Hash of the private transaction
|
|
pub fn hash(&self) -> H256 {
|
|
self.hash
|
|
}
|
|
|
|
/// Address of the contract
|
|
pub fn contract(&self) -> Address {
|
|
self.contract
|
|
}
|
|
|
|
/// Encrypted data
|
|
pub fn encrypted(&self) -> Bytes {
|
|
self.encrypted.clone()
|
|
}
|
|
}
|
|
|
|
/// Message about private transaction's signing
|
|
#[derive(Default, Debug, Clone, PartialEq, RlpEncodable, RlpDecodable, Eq)]
|
|
pub struct SignedPrivateTransaction {
|
|
/// Hash of the corresponding private transaction
|
|
private_transaction_hash: H256,
|
|
/// Signature of the validator
|
|
/// The V field of the signature
|
|
v: u64,
|
|
/// The R field of the signature
|
|
r: U256,
|
|
/// The S field of the signature
|
|
s: U256,
|
|
/// Hash
|
|
hash: H256,
|
|
}
|
|
|
|
impl SignedPrivateTransaction {
|
|
/// Construct a signed private transaction message
|
|
pub fn new(private_transaction_hash: H256, sig: Signature, chain_id: Option<u64>) -> Self {
|
|
SignedPrivateTransaction {
|
|
private_transaction_hash: private_transaction_hash,
|
|
r: sig.r().into(),
|
|
s: sig.s().into(),
|
|
v: add_chain_replay_protection(sig.v() as u64, chain_id),
|
|
hash: H256::zero(),
|
|
}.compute_hash()
|
|
}
|
|
|
|
fn compute_hash(mut self) -> SignedPrivateTransaction {
|
|
self.hash = keccak(&*self.rlp_bytes());
|
|
self
|
|
}
|
|
|
|
pub fn standard_v(&self) -> u8 { check_replay_protection(self.v) }
|
|
|
|
/// Construct a signature object from the sig.
|
|
pub fn signature(&self) -> Signature {
|
|
Signature::from_rsv(
|
|
&BigEndianHash::from_uint(&self.r),
|
|
&BigEndianHash::from_uint(&self.s),
|
|
self.standard_v(),
|
|
)
|
|
}
|
|
|
|
/// Get the hash of of the original transaction.
|
|
pub fn private_transaction_hash(&self) -> H256 {
|
|
self.private_transaction_hash
|
|
}
|
|
|
|
/// Own hash
|
|
pub fn hash(&self) -> H256 {
|
|
self.hash
|
|
}
|
|
}
|