e6f75bccfe
* Private transaction message added * Empty line removed * Private transactions logic removed from client into the separate module * Fixed compilation after merge with head * Signed private transaction message added as well * Comments after the review fixed * Private tx execution * Test update * Renamed some methods * Fixed some tests * Reverted submodules * Fixed build * Private transaction message added * Empty line removed * Private transactions logic removed from client into the separate module * Fixed compilation after merge with head * Signed private transaction message added as well * Comments after the review fixed * Encrypted private transaction message and signed reply added * Private tx execution * Test update * Main scenario completed * Merged with the latest head * Private transactions API * Comments after review fixed * Parameters for private transactions added to parity arguments * New files added * New API methods added * Do not process packets from unconfirmed peers * Merge with ptm_ss branch * Encryption and permissioning with key server added * Fixed compilation after merge * Version of Parity protocol incremented in order to support private transactions * Doc strings for constants added * Proper format for doc string added * fixed some encryptor.rs grumbles * Private transactions functionality moved to the separate crate * Refactoring in order to remove late initialisation * Tests fixed after moving to the separate crate * Fetch method removed * Sync test helpers refactored * Interaction with encryptor refactored * Contract address retrieving via substate removed * Sensible gas limit for private transactions implemented * New private contract with nonces added * Parsing of the response from key server fixed * Build fixed after the merge, native contracts removed * Crate renamed * Tests moved to the separate directory * Handling of errors reworked in order to use error chain * Encodable macro added, new constructor replaced with default * Native ethabi usage removed * Couple conversions optimized * Interactions with client reworked * Errors omitting removed * Fix after merge * Fix after the merge * private transactions improvements in progress * private_transactions -> ethcore/private-tx * making private transactions more idiomatic * private-tx encryptor uses shared FetchClient and is more idiomatic * removed redundant tests, moved integration tests to tests/ dir * fixed failing service test * reenable add_notify on private tx provider * removed private_tx tests from sync module * removed commented out code * Use plain password instead of unlocking account manager * remove dead code * Link to the contract changed * Transaction signature chain replay protection module created * Redundant type conversion removed * Contract address returned by private provider * Test fixed * Addressing grumbles in PrivateTransactions (#8249) * Tiny fixes part 1. * A bunch of additional comments and todos. * Fix ethsync tests. * resolved merge conflicts * final private tx pr (#8318) * added cli option that enables private transactions * fixed failing test * fixed failing test * fixed failing test * fixed failing test
77 lines
2.4 KiB
Rust
77 lines
2.4 KiB
Rust
// Copyright 2015-2017 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/>.
|
|
|
|
use ethereum_types::{H256, U256, Address};
|
|
use bytes::Bytes;
|
|
use hash::keccak;
|
|
use rlp::Encodable;
|
|
use ethkey::Signature;
|
|
use 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
|
|
pub encrypted: Bytes,
|
|
/// Address of the contract
|
|
pub contract: Address,
|
|
}
|
|
|
|
impl PrivateTransaction {
|
|
/// Compute hash on private transaction
|
|
pub fn hash(&self) -> H256 {
|
|
keccak(&*self.rlp_bytes())
|
|
}
|
|
}
|
|
|
|
/// 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,
|
|
}
|
|
|
|
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),
|
|
}
|
|
}
|
|
|
|
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(&self.r.into(), &self.s.into(), self.standard_v())
|
|
}
|
|
|
|
/// Get the hash of of the original transaction.
|
|
pub fn private_transaction_hash(&self) -> H256 {
|
|
self.private_transaction_hash
|
|
}
|
|
}
|