grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove private transactions

Browse Source
This commit is contained in:
Artem Vorotnikov 2020-09-02 18:43:14 +03:00
parent a8668b371c
commit ea0c13c0a4
No known key found for this signature in database
GPG Key ID: E0148C3F2FBB7A20
54 changed files with 38 additions and 3992 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Cargo.lock generated
View File

@ -574,17 +574,6 @@ dependencies = [
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "derive_more"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "difference" name = "difference"
version = "1.0.0" version = "1.0.0"
@ -1063,45 +1052,6 @@ dependencies = [
"tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "ethcore-private-tx"
version = "1.0.0"
dependencies = [
"common-types 0.1.0",
"derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
"ethabi 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.12.0",
"ethcore-call-contract 0.1.0",
"ethcore-io 1.12.0",
"ethcore-miner 1.12.0",
"ethereum-types 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethjson 0.1.0",
"ethkey 0.3.0",
"fetch 0.1.0",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.2 (git+https://github.com/cheme/heapsize.git?branch=ec-macfix)",
"keccak-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-bytes 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-crypto 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia-trie-ethereum 0.1.0",
"rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp_derive 0.1.0",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
"tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"transaction-pool 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"trie-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "ethcore-secretstore" name = "ethcore-secretstore"
version = "1.0.0" version = "1.0.0"
@ -1153,7 +1103,6 @@ dependencies = [
"ethcore-blockchain 0.1.0", "ethcore-blockchain 0.1.0",
"ethcore-db 0.1.0", "ethcore-db 0.1.0",
"ethcore-io 1.12.0", "ethcore-io 1.12.0",
"ethcore-private-tx 1.0.0",
"ethcore-sync 1.12.0", "ethcore-sync 1.12.0",
"ethereum-types 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1189,7 +1138,6 @@ dependencies = [
"ethcore-io 1.12.0", "ethcore-io 1.12.0",
"ethcore-network 1.12.0", "ethcore-network 1.12.0",
"ethcore-network-devp2p 1.12.0", "ethcore-network-devp2p 1.12.0",
"ethcore-private-tx 1.0.0",
"ethereum-types 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0", "ethkey 0.3.0",
"ethstore 0.2.1", "ethstore 0.2.1",
@ -2567,7 +2515,6 @@ dependencies = [
"ethcore-logger 1.12.0", "ethcore-logger 1.12.0",
"ethcore-miner 1.12.0", "ethcore-miner 1.12.0",
"ethcore-network 1.12.0", "ethcore-network 1.12.0",
"ethcore-private-tx 1.0.0",
"ethcore-secretstore 1.0.0", "ethcore-secretstore 1.0.0",
"ethcore-service 0.1.0", "ethcore-service 0.1.0",
"ethcore-sync 1.12.0", "ethcore-sync 1.12.0",
@ -2676,7 +2623,6 @@ dependencies = [
"ethcore-logger 1.12.0", "ethcore-logger 1.12.0",
"ethcore-miner 1.12.0", "ethcore-miner 1.12.0",
"ethcore-network 1.12.0", "ethcore-network 1.12.0",
"ethcore-private-tx 1.0.0",
"ethcore-sync 1.12.0", "ethcore-sync 1.12.0",
"ethereum-types 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethjson 0.1.0", "ethjson 0.1.0",
@ -4695,7 +4641,6 @@ dependencies = [
"checksum ct-logs 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1b4660f8b07a560a88c02d76286edb9f0d5d64e495d2b0f233186155aa51be1f" "checksum ct-logs 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1b4660f8b07a560a88c02d76286edb9f0d5d64e495d2b0f233186155aa51be1f"
"checksum ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" "checksum ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736"
"checksum ctrlc 1.1.1 (git+https://github.com/paritytech/rust-ctrlc.git)" = "<none>" "checksum ctrlc 1.1.1 (git+https://github.com/paritytech/rust-ctrlc.git)" = "<none>"
"checksum derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6d944ac6003ed268757ef1ee686753b57efc5fcf0ebe7b64c9fc81e7e32ff839"
"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8" "checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
"checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" "checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"

1
Cargo.toml
View File

@ -41,7 +41,6 @@ ethcore-io = { path = "util/io" }
ethcore-logger = { path = "parity/logger" } ethcore-logger = { path = "parity/logger" }
ethcore-miner = { path = "miner" } ethcore-miner = { path = "miner" }
ethcore-network = { path = "util/network" } ethcore-network = { path = "util/network" }
ethcore-private-tx = { path = "ethcore/private-tx" }
ethcore-service = { path = "ethcore/service" } ethcore-service = { path = "ethcore/service" }
ethcore-sync = { path = "ethcore/sync" } ethcore-sync = { path = "ethcore/sync" }
ethereum-types = "0.4" ethereum-types = "0.4"

4
README.md
View File

@ -244,10 +244,6 @@ Caching, Importing Blocks, and Block Information
```bash ```bash
node-filter node-filter
``` ```
* Parity Private Transactions
```bash
ethcore-private-tx
```
* Parity Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem * Parity Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem
```bash ```bash
ethcore-service ethcore-service

44
ethcore/private-tx/Cargo.toml
View File

@ -1,44 +0,0 @@
[package]
description = "Parity Private Transactions"
name = "ethcore-private-tx"
version = "1.0.0"
license = "GPL-3.0"
authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
common-types = { path = "../types" }
derive_more = "0.14.0"
ethabi = "6.0"
ethabi-contract = "6.0"
ethabi-derive = "6.0"
ethcore = { path = ".." }
ethcore-call-contract = { path = "../call-contract" }
ethcore-io = { path = "../../util/io" }
ethcore-miner = { path = "../../miner" }
ethereum-types = "0.4"
ethjson = { path = "../../json" }
ethkey = { path = "../../accounts/ethkey" }
fetch = { path = "../../util/fetch" }
futures = "0.1"
heapsize = "0.4"
keccak-hash = "0.1.2"
log = "0.4"
parity-bytes = "0.1"
parity-crypto = "0.3.0"
parking_lot = "0.7"
trie-db = "0.11.0"
patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
rand = "0.3"
rlp = { version = "0.3.0", features = ["ethereum"] }
rlp_derive = { path = "../../util/rlp-derive" }
rustc-hex = "1.0"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
tiny-keccak = "1.4"
transaction-pool = "2.0.1"
url = "2"
[dev-dependencies]
env_logger = "0.5"
ethcore = { path = "..", features = ["test-helpers"] }

43
ethcore/private-tx/res/keys_acl.json
View File

@ -1,43 +0,0 @@
[
{
"constant": true,
"inputs": [
{
"name":"user",
"type":"address"
}
],
"name": "availableKeys",
"outputs": [
{
"name": "",
"type": "bytes32[]"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant":true,
"inputs": [
{
"name":"user",
"type":"address"
},
{
"name":"document",
"type":"bytes32"
}
],
"name":"checkPermissions",
"outputs": [
{
"name":"",
"type":"bool"
}
],
"payable":false,
"type":"function"
}
]

1
ethcore/private-tx/res/private.evm
View File

File diff suppressed because one or more lines are too long

171
ethcore/private-tx/res/private.json
View File

@ -1,171 +0,0 @@
[
{
"constant": true,
"inputs": [],
"name": "getVersion",
"outputs": [
{
"name": "",
"type": "uint8"
}
],
"payable": false,
"stateMutability": "pure",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "newState",
"type": "bytes"
},
{
"name": "v",
"type": "uint8[]"
},
{
"name": "r",
"type": "bytes32[]"
},
{
"name": "s",
"type": "bytes32[]"
}
],
"name": "setState",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "code",
"outputs": [
{
"name": "",
"type": "bytes"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "",
"type": "uint256"
}
],
"name": "validators",
"outputs": [
{
"name": "",
"type": "address"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "changesOriginator",
"type": "address"
},
{
"name": "originalTransactionHash",
"type": "bytes"
}
],
"name": "notifyChanges",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "nonce",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "getValidators",
"outputs": [
{
"name": "",
"type": "address[]"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "state",
"outputs": [
{
"name": "",
"type": "bytes"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"name": "initialValidators",
"type": "address[]"
},
{
"name": "initialCode",
"type": "bytes"
},
{
"name": "initialState",
"type": "bytes"
}
],
"payable": false,
"stateMutability": "nonpayable",
"type": "constructor"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"name": "changesOriginator",
"type": "address"
},
{
"indexed": false,
"name": "originalTransactionHash",
"type": "bytes"
}
],
"name": "PrivateStateChanged",
"type": "event"
}
]

288
ethcore/private-tx/src/encryptor.rs
View File

@ -1,288 +0,0 @@
// 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/>.
//! Encryption providers.
use super::{key_server_keys::address_to_key, Signer};
use bytes::{Bytes, ToPretty};
use crypto;
use error::Error;
use ethereum_types::{Address, H128, H256};
use ethjson;
use ethkey::{Public, Signature};
use fetch::{BodyReader, Client as FetchClient, Fetch, Method, Request};
use futures::Future;
use parking_lot::Mutex;
use std::{
collections::{hash_map::Entry, HashMap},
io::Read,
iter::repeat,
str::FromStr,
sync::Arc,
time::{Duration, Instant},
};
use url::Url;
/// Initialization vector length.
const INIT_VEC_LEN: usize = 16;
/// Duration of storing retrieved keys (in ms)
const ENCRYPTION_SESSION_DURATION: u64 = 30 * 1000;
/// Trait for encryption/decryption operations.
pub trait Encryptor: Send + Sync + 'static {
/// Generate unique contract key && encrypt passed data. Encryption can only be performed once.
fn encrypt(
&self,
contract_address: &Address,
initialisation_vector: &H128,
plain_data: &[u8],
) -> Result<Bytes, Error>;
/// Decrypt data using previously generated contract key.
fn decrypt(&self, contract_address: &Address, cypher: &[u8]) -> Result<Bytes, Error>;
}
/// Configuration for key server encryptor
#[derive(Default, PartialEq, Debug, Clone)]
pub struct EncryptorConfig {
/// URL to key server
pub base_url: Option<String>,
/// Key server's threshold
pub threshold: u32,
/// Account used for signing requests to key server
pub key_server_account: Option<Address>,
}
struct EncryptionSession {
key: Bytes,
end_time: Instant,
}
/// SecretStore-based encryption/decryption operations.
pub struct SecretStoreEncryptor {
config: EncryptorConfig,
client: FetchClient,
sessions: Mutex<HashMap<Address, EncryptionSession>>,
signer: Arc<dyn Signer>,
}
impl SecretStoreEncryptor {
/// Create new encryptor
pub fn new(
config: EncryptorConfig,
client: FetchClient,
signer: Arc<dyn Signer>,
) -> Result<Self, Error> {
Ok(SecretStoreEncryptor {
config,
client,
signer,
sessions: Mutex::default(),
})
}
/// Ask secret store for key && decrypt the key.
fn retrieve_key(
&self,
url_suffix: &str,
use_post: bool,
contract_address: &Address,
) -> Result<Bytes, Error> {
// check if the key was already cached
if let Some(key) = self.obtained_key(contract_address) {
return Ok(key);
}
let contract_address_signature = self.sign_contract_address(contract_address)?;
let requester = self
.config
.key_server_account
.ok_or_else(|| Error::KeyServerAccountNotSet)?;
// key id in SS is H256 && we have H160 here => expand with assitional zeros
let contract_address_extended: H256 = contract_address.into();
let base_url = self
.config
.base_url
.clone()
.ok_or_else(|| Error::KeyServerNotSet)?;
// prepare request url
let url = format!(
"{}/{}/{}{}",
base_url,
contract_address_extended.to_hex(),
contract_address_signature,
url_suffix,
);
// send HTTP request
let method = if use_post { Method::POST } else { Method::GET };
let url = Url::from_str(&url).map_err(|e| Error::Encrypt(e.to_string()))?;
let response = self
.client
.fetch(Request::new(url, method), Default::default())
.wait()
.map_err(|e| Error::Encrypt(e.to_string()))?;
if response.is_not_found() {
return Err(Error::EncryptionKeyNotFound(*contract_address));
}
if !response.is_success() {
return Err(Error::Encrypt(
response
.status()
.canonical_reason()
.unwrap_or("unknown")
.into(),
));
}
// read HTTP response
let mut result = String::new();
BodyReader::new(response).read_to_string(&mut result)?;
// response is JSON string (which is, in turn, hex-encoded, encrypted Public)
let encrypted_bytes: ethjson::bytes::Bytes = result
.trim_matches('\"')
.parse()
.map_err(|e| Error::Encrypt(e))?;
// decrypt Public
let decrypted_bytes =
self.signer
.decrypt(requester, &crypto::DEFAULT_MAC, &encrypted_bytes)?;
let decrypted_key = Public::from_slice(&decrypted_bytes);
// and now take x coordinate of Public as a key
let key: Bytes = (*decrypted_key)[..INIT_VEC_LEN].into();
// cache the key in the session and clear expired sessions
self.sessions.lock().insert(
*contract_address,
EncryptionSession {
key: key.clone(),
end_time: Instant::now() + Duration::from_millis(ENCRYPTION_SESSION_DURATION),
},
);
self.clean_expired_sessions();
Ok(key)
}
fn clean_expired_sessions(&self) {
let mut sessions = self.sessions.lock();
sessions.retain(|_, session| session.end_time < Instant::now());
}
fn obtained_key(&self, contract_address: &Address) -> Option<Bytes> {
let mut sessions = self.sessions.lock();
let stored_session = sessions.entry(*contract_address);
match stored_session {
Entry::Occupied(session) => {
if Instant::now() > session.get().end_time {
session.remove_entry();
None
} else {
Some(session.get().key.clone())
}
}
Entry::Vacant(_) => None,
}
}
fn sign_contract_address(&self, contract_address: &Address) -> Result<Signature, Error> {
let key_server_account = self
.config
.key_server_account
.ok_or_else(|| Error::KeyServerAccountNotSet)?;
Ok(self
.signer
.sign(key_server_account, address_to_key(contract_address))?)
}
}
impl Encryptor for SecretStoreEncryptor {
fn encrypt(
&self,
contract_address: &Address,
initialisation_vector: &H128,
plain_data: &[u8],
) -> Result<Bytes, Error> {
// retrieve the key, try to generate it if it doesn't exist yet
let key = match self.retrieve_key("", false, contract_address) {
Ok(key) => Ok(key),
Err(Error::EncryptionKeyNotFound(_)) => {
trace!(target: "privatetx", "Key for account wasnt found in sstore. Creating. Address: {:?}", contract_address);
self.retrieve_key(
&format!("/{}", self.config.threshold),
true,
contract_address,
)
}
Err(err) => Err(err),
}?;
// encrypt data
let mut cypher = Vec::with_capacity(plain_data.len() + initialisation_vector.len());
cypher.extend(repeat(0).take(plain_data.len()));
crypto::aes::encrypt_128_ctr(&key, initialisation_vector, plain_data, &mut cypher)
.map_err(|e| Error::Encrypt(e.to_string()))?;
cypher.extend_from_slice(&initialisation_vector);
Ok(cypher)
}
/// Decrypt data using previously generated contract key.
fn decrypt(&self, contract_address: &Address, cypher: &[u8]) -> Result<Bytes, Error> {
// initialization vector takes INIT_VEC_LEN bytes
let cypher_len = cypher.len();
if cypher_len < INIT_VEC_LEN {
return Err(Error::Decrypt("Invalid cypher".into()));
}
// retrieve existing key
let key = self.retrieve_key("", false, contract_address)?;
// use symmetric decryption to decrypt document
let (cypher, iv) = cypher.split_at(cypher_len - INIT_VEC_LEN);
let mut plain_data = Vec::with_capacity(cypher_len - INIT_VEC_LEN);
plain_data.extend(repeat(0).take(cypher_len - INIT_VEC_LEN));
crypto::aes::decrypt_128_ctr(&key, &iv, cypher, &mut plain_data)
.map_err(|e| Error::Decrypt(e.to_string()))?;
Ok(plain_data)
}
}
/// Dummy encryptor.
#[derive(Default)]
pub struct NoopEncryptor;
impl Encryptor for NoopEncryptor {
fn encrypt(
&self,
_contract_address: &Address,
_initialisation_vector: &H128,
data: &[u8],
) -> Result<Bytes, Error> {
Ok(data.to_vec())
}
fn decrypt(&self, _contract_address: &Address, data: &[u8]) -> Result<Bytes, Error> {
Ok(data.to_vec())
}
}

202
ethcore/private-tx/src/error.rs
View File

@ -1,202 +0,0 @@
// 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 derive_more::Display;
use ethcore::error::{Error as EthcoreError, ExecutionError};
use ethereum_types::Address;
use ethkey::{crypto::Error as CryptoError, Error as KeyError};
use ethtrie::TrieError;
use private_transactions::VerifiedPrivateTransaction;
use rlp::DecoderError;
use std::error;
use txpool::VerifiedTransaction;
use types::transaction::Error as TransactionError;
type TxPoolError = txpool::Error<<VerifiedPrivateTransaction as VerifiedTransaction>::Hash>;
#[derive(Debug, Display)]
pub enum Error {
/// Error concerning the Rust standard library's IO subsystem.
#[display(fmt = "Io Error: {}", _0)]
Io(::std::io::Error),
/// RLP decoding error.
#[display(fmt = "Decoder Error: {}", _0)]
Decoder(DecoderError),
/// Error concerning TrieDBs.
#[display(fmt = "Trie Error: {}", _0)]
Trie(TrieError),
/// Transaction pool error.
#[display(fmt = "Transaction Pool Error: {}", _0)]
TxPool(TxPoolError),
/// Crypto error.
#[display(fmt = "Crypto Error {}", _0)]
Crypto(CryptoError),
/// Encryption error.
#[display(fmt = "Encryption error. ({})", _0)]
Encrypt(String),
/// Decryption error.
#[display(fmt = "Decryption error. ({})", _0)]
Decrypt(String),
/// Address not authorized.
#[display(fmt = "Private transaction execution is not authorised for {}", _0)]
NotAuthorised(Address),
/// Transaction creates more than one contract.
#[display(fmt = "Private transaction created too many contracts")]
TooManyContracts,
/// Contract call error.
#[display(fmt = "Contract call error. ({})", _0)]
Call(String),
/// State is not available.
#[display(fmt = "State is not available")]
StatePruned,
/// State is incorrect.
#[display(fmt = "State is incorrect")]
StateIncorrect,
/// Wrong private transaction type.
#[display(fmt = "Wrong private transaction type")]
BadTransactionType,
/// Contract does not exist or was not created.
#[display(fmt = "Contract does not exist or was not created")]
ContractDoesNotExist,
/// Reference to the client is corrupted.
#[display(fmt = "Reference to the client is corrupted")]
ClientIsMalformed,
/// Queue of private transactions for verification is full.
#[display(fmt = "Queue of private transactions for verification is full")]
QueueIsFull,
/// The transaction already exists in queue of private transactions.
#[display(fmt = "The transaction already exists in queue of private transactions.")]
PrivateTransactionAlreadyImported,
/// The information about private transaction is not found in the store.
#[display(fmt = "The information about private transaction is not found in the store.")]
PrivateTransactionNotFound,
/// Account for signing public transactions not set.
#[display(fmt = "Account for signing public transactions not set.")]
SignerAccountNotSet,
/// Account for validating private transactions not set.
#[display(fmt = "Account for validating private transactions not set.")]
ValidatorAccountNotSet,
/// Account for signing requests to key server not set.
#[display(fmt = "Account for signing requests to key server not set.")]
KeyServerAccountNotSet,
/// Encryption key is not found on key server.
#[display(fmt = "Encryption key is not found on key server for {}", _0)]
EncryptionKeyNotFound(Address),
/// Key server URL is not set.
#[display(fmt = "Key server URL is not set.")]
KeyServerNotSet,
/// VM execution error.
#[display(fmt = "VM execution error {}", _0)]
Execution(ExecutionError),
/// General signing error.
#[display(fmt = "General signing error {}", _0)]
Key(KeyError),
/// Error of transactions processing.
#[display(fmt = "Error of transactions processing {}", _0)]
Transaction(TransactionError),
/// General ethcore error.
#[display(fmt = "General ethcore error {}", _0)]
Ethcore(EthcoreError),
/// A convenient variant for String.
#[display(fmt = "{}", _0)]
Msg(String),
}
impl error::Error for Error {
fn source(&self) -> Option<&(dyn error::Error + 'static)> {
match self {
Error::Io(e) => Some(e),
Error::Decoder(e) => Some(e),
Error::Trie(e) => Some(e),
Error::TxPool(e) => Some(e),
Error::Crypto(e) => Some(e),
Error::Execution(e) => Some(e),
Error::Key(e) => Some(e),
Error::Transaction(e) => Some(e),
Error::Ethcore(e) => Some(e),
_ => None,
}
}
}
impl From<String> for Error {
fn from(s: String) -> Self {
Error::Msg(s)
}
}
impl From<std::io::Error> for Error {
fn from(err: std::io::Error) -> Self {
Error::Io(err).into()
}
}
impl From<KeyError> for Error {
fn from(err: KeyError) -> Self {
Error::Key(err).into()
}
}
impl From<CryptoError> for Error {
fn from(err: CryptoError) -> Self {
Error::Crypto(err).into()
}
}
impl From<DecoderError> for Error {
fn from(err: DecoderError) -> Self {
Error::Decoder(err).into()
}
}
impl From<ExecutionError> for Error {
fn from(err: ExecutionError) -> Self {
Error::Execution(err).into()
}
}
impl From<TransactionError> for Error {
fn from(err: TransactionError) -> Self {
Error::Transaction(err).into()
}
}
impl From<TrieError> for Error {
fn from(err: TrieError) -> Self {
Error::Trie(err).into()
}
}
impl From<TxPoolError> for Error {
fn from(err: TxPoolError) -> Self {
Error::TxPool(err).into()
}
}
impl From<EthcoreError> for Error {
fn from(err: EthcoreError) -> Self {
Error::Ethcore(err).into()
}
}
impl<E> From<Box<E>> for Error
where
Error: From<E>,
{
fn from(err: Box<E>) -> Error {
Error::from(*err)
}
}

195
ethcore/private-tx/src/key_server_keys.rs
View File

@ -1,195 +0,0 @@
// Copyright 2015-2018 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/>.
//! Wrapper around key server responsible for access keys processing.
use call_contract::{CallContract, RegistryInfo};
use ethabi::FunctionOutputDecoder;
use ethcore::client::BlockId;
use ethereum_types::{Address, H256};
use parking_lot::RwLock;
use std::sync::Arc;
const ACL_CHECKER_CONTRACT_REGISTRY_NAME: &'static str = "secretstore_acl_checker";
use_contract!(keys_acl_contract, "res/keys_acl.json");
/// Returns the address (of the contract), that corresponds to the key
pub fn key_to_address(key: &H256) -> Address {
Address::from_slice(&key.to_vec()[..10])
}
/// Returns the key from the key server associated with the contract
pub fn address_to_key(contract_address: &Address) -> H256 {
// Current solution uses contract address extended with 0 as id
let contract_address_extended: H256 = contract_address.into();
H256::from_slice(&contract_address_extended)
}
/// Trait for keys server keys provider.
pub trait KeyProvider: Send + Sync + 'static {
/// Account, that is used for communication with key server
fn key_server_account(&self) -> Option<Address>;
/// List of keys available for the account
fn available_keys(&self, block: BlockId, account: &Address) -> Option<Vec<Address>>;
/// Update permissioning contract
fn update_acl_contract(&self);
}
/// Secret Store keys provider
pub struct SecretStoreKeys<C>
where
C: CallContract + RegistryInfo + Send + Sync + 'static,
{
client: Arc<C>,
key_server_account: Option<Address>,
keys_acl_contract: RwLock<Option<Address>>,
}
impl<C> SecretStoreKeys<C>
where
C: CallContract + RegistryInfo + Send + Sync + 'static,
{
/// Create provider
pub fn new(client: Arc<C>, key_server_account: Option<Address>) -> Self {
SecretStoreKeys {
client,
key_server_account,
keys_acl_contract: RwLock::new(None),
}
}
}
impl<C> KeyProvider for SecretStoreKeys<C>
where
C: CallContract + RegistryInfo + Send + Sync + 'static,
{
fn key_server_account(&self) -> Option<Address> {
self.key_server_account
}
fn available_keys(&self, block: BlockId, account: &Address) -> Option<Vec<Address>> {
match *self.keys_acl_contract.read() {
Some(acl_contract_address) => {
let (data, decoder) = keys_acl_contract::functions::available_keys::call(*account);
if let Ok(value) = self.client.call_contract(block, acl_contract_address, data) {
decoder
.decode(&value)
.ok()
.map(|key_values| key_values.iter().map(key_to_address).collect())
} else {
None
}
}
None => None,
}
}
fn update_acl_contract(&self) {
let contract_address = self
.client
.registry_address(ACL_CHECKER_CONTRACT_REGISTRY_NAME.into(), BlockId::Latest);
if *self.keys_acl_contract.read() != contract_address {
trace!(target: "privatetx", "Configuring for ACL checker contract from address {:?}",
contract_address);
*self.keys_acl_contract.write() = contract_address;
}
}
}
/// Dummy keys provider.
pub struct StoringKeyProvider {
available_keys: RwLock<Option<Vec<Address>>>,
key_server_account: Option<Address>,
}
impl StoringKeyProvider {
/// Store available keys
pub fn set_available_keys(&self, keys: &Vec<Address>) {
*self.available_keys.write() = Some(keys.clone())
}
}
impl Default for StoringKeyProvider {
fn default() -> Self {
StoringKeyProvider {
available_keys: RwLock::new(None),
key_server_account: Some(Address::default()),
}
}
}
impl KeyProvider for StoringKeyProvider {
fn key_server_account(&self) -> Option<Address> {
self.key_server_account
}
fn available_keys(&self, _block: BlockId, _account: &Address) -> Option<Vec<Address>> {
self.available_keys.read().clone()
}
fn update_acl_contract(&self) {}
}
#[cfg(test)]
mod tests {
use super::*;
use bytes::Bytes;
use ethkey::{KeyPair, Secret};
use std::sync::Arc;
struct DummyRegistryClient {
registry_address: Option<Address>,
}
impl DummyRegistryClient {
pub fn new(registry_address: Option<Address>) -> Self {
DummyRegistryClient { registry_address }
}
}
impl RegistryInfo for DummyRegistryClient {
fn registry_address(&self, _name: String, _block: BlockId) -> Option<Address> {
self.registry_address
}
}
impl CallContract for DummyRegistryClient {
fn call_contract(
&self,
_id: BlockId,
_address: Address,
_data: Bytes,
) -> Result<Bytes, String> {
Ok(vec![])
}
}
#[test]
fn should_update_acl_contract() {
let key = KeyPair::from_secret(Secret::from(
"0000000000000000000000000000000000000000000000000000000000000011",
))
.unwrap();
let client = DummyRegistryClient::new(Some(key.address()));
let keys_data = SecretStoreKeys::new(Arc::new(client), None);
keys_data.update_acl_contract();
assert_eq!(keys_data.keys_acl_contract.read().unwrap(), key.address());
}
}

1004
ethcore/private-tx/src/lib.rs
View File

File diff suppressed because it is too large Load Diff

119
ethcore/private-tx/src/messages.rs
View File

@ -1,119 +0,0 @@
// 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 bytes::Bytes;
use ethereum_types::{Address, H256, U256};
use ethkey::Signature;
use hash::keccak;
use rlp::Encodable;
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: 0.into(),
}
.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: 0.into(),
}
.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(&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
}
/// Own hash
pub fn hash(&self) -> H256 {
self.hash
}
}

278
ethcore/private-tx/src/private_transactions.rs
View File

@ -1,278 +0,0 @@
// 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::{
cmp,
collections::{HashMap, HashSet},
sync::Arc,
};
use bytes::Bytes;
use error::Error;
use ethcore_miner::pool;
use ethereum_types::{Address, H256, U256};
use ethkey::Signature;
use heapsize::HeapSizeOf;
use messages::PrivateTransaction;
use parking_lot::RwLock;
use txpool::{self, VerifiedTransaction, Verifier};
use types::transaction::{SignedTransaction, UnverifiedTransaction};
type Pool = txpool::Pool<VerifiedPrivateTransaction, pool::scoring::NonceAndGasPrice>;
/// Maximum length for private transactions queues.
const MAX_QUEUE_LEN: usize = 8312;
/// Private transaction stored in queue for verification
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct VerifiedPrivateTransaction {
/// Original private transaction
pub private_transaction: PrivateTransaction,
/// Address that should be used for verification
pub validator_account: Option<Address>,
/// Resulting verified transaction
pub transaction: SignedTransaction,
/// Original transaction hash
pub transaction_hash: H256,
/// Original transaction sender
pub transaction_sender: Address,
}
impl txpool::VerifiedTransaction for VerifiedPrivateTransaction {
type Hash = H256;
type Sender = Address;
fn hash(&self) -> &H256 {
&self.transaction_hash
}
fn mem_usage(&self) -> usize {
self.transaction.heap_size_of_children()
}
fn sender(&self) -> &Address {
&self.transaction_sender
}
}
impl pool::ScoredTransaction for VerifiedPrivateTransaction {
fn priority(&self) -> pool::Priority {
pool::Priority::Regular
}
/// Gets transaction gas price.
fn gas_price(&self) -> &U256 {
&self.transaction.gas_price
}
/// Gets transaction nonce.
fn nonce(&self) -> U256 {
self.transaction.nonce
}
}
/// Checks readiness of transactions by looking if the transaction from sender already exists.
/// Guarantees only one transaction per sender
#[derive(Debug)]
pub struct PrivateReadyState<C> {
senders: HashSet<Address>,
state: C,
}
impl<C> PrivateReadyState<C> {
/// Create new State checker, given client interface.
pub fn new(state: C) -> Self {
PrivateReadyState {
senders: Default::default(),
state,
}
}
}
impl<C: pool::client::NonceClient> txpool::Ready<VerifiedPrivateTransaction>
for PrivateReadyState<C>
{
fn is_ready(&mut self, tx: &VerifiedPrivateTransaction) -> txpool::Readiness {
let sender = tx.sender();
let state = &self.state;
let state_nonce = state.account_nonce(sender);
if self.senders.contains(sender) {
txpool::Readiness::Future
} else {
self.senders.insert(*sender);
match tx.transaction.nonce.cmp(&state_nonce) {
cmp::Ordering::Greater => txpool::Readiness::Future,
cmp::Ordering::Less => txpool::Readiness::Stale,
cmp::Ordering::Equal => txpool::Readiness::Ready,
}
}
}
}
/// Storage for private transactions for verification
pub struct VerificationStore {
verification_pool: RwLock<Pool>,
verification_options: pool::verifier::Options,
}
impl Default for VerificationStore {
fn default() -> Self {
VerificationStore {
verification_pool: RwLock::new(txpool::Pool::new(
txpool::NoopListener,
pool::scoring::NonceAndGasPrice(pool::PrioritizationStrategy::GasPriceOnly),
pool::Options {
max_count: MAX_QUEUE_LEN,
max_per_sender: MAX_QUEUE_LEN / 10,
max_mem_usage: 8 * 1024 * 1024,
},
)),
verification_options: pool::verifier::Options {
// TODO [ToDr] This should probably be based on some real values?
minimal_gas_price: 0.into(),
block_gas_limit: 8_000_000.into(),
tx_gas_limit: U256::max_value(),
no_early_reject: false,
},
}
}
}
impl VerificationStore {
/// Adds private transaction for verification into the store
pub fn add_transaction<C: pool::client::Client + pool::client::NonceClient + Clone>(
&self,
transaction: UnverifiedTransaction,
validator_account: Option<Address>,
private_transaction: PrivateTransaction,
client: C,
) -> Result<(), Error> {
let options = self.verification_options.clone();
// Use pool's verifying pipeline for original transaction's verification
let verifier =
pool::verifier::Verifier::new(client.clone(), options, Default::default(), None);
let unverified = pool::verifier::Transaction::Unverified(transaction);
let verified_tx = verifier.verify_transaction(unverified)?;
let signed_tx: SignedTransaction = verified_tx.signed().clone();
let signed_hash = signed_tx.hash();
let signed_sender = signed_tx.sender();
let verified = VerifiedPrivateTransaction {
private_transaction,
validator_account,
transaction: signed_tx,
transaction_hash: signed_hash,
transaction_sender: signed_sender,
};
let replace = pool::replace::ReplaceByScoreAndReadiness::new(
self.verification_pool.read().scoring().clone(),
client,
);
self.verification_pool.write().import(verified, &replace)?;
Ok(())
}
/// Drains transactions ready for verification from the pool
/// Returns only one transaction per sender because several cannot be verified in a row without verification from other peers
pub fn drain<C: pool::client::NonceClient>(
&self,
client: C,
) -> Vec<Arc<VerifiedPrivateTransaction>> {
let ready = PrivateReadyState::new(client);
let transactions: Vec<_> = self.verification_pool.read().pending(ready).collect();
let mut pool = self.verification_pool.write();
for tx in &transactions {
pool.remove(tx.hash(), true);
}
transactions
}
}
/// Desriptor for private transaction stored in queue for signing
#[derive(Debug, Clone)]
pub struct PrivateTransactionSigningDesc {
/// Original unsigned transaction
pub original_transaction: SignedTransaction,
/// Supposed validators from the contract
pub validators: Vec<Address>,
/// Already obtained signatures
pub received_signatures: Vec<Signature>,
/// State after transaction execution to compare further with received from validators
pub state: Bytes,
/// Build-in nonce of the contract
pub contract_nonce: U256,
}
/// Storage for private transactions for signing
#[derive(Default)]
pub struct SigningStore {
/// Transactions and descriptors for signing
transactions: HashMap<H256, PrivateTransactionSigningDesc>,
}
impl SigningStore {
/// Adds new private transaction into the store for signing
pub fn add_transaction(
&mut self,
private_hash: H256,
transaction: SignedTransaction,
validators: Vec<Address>,
state: Bytes,
contract_nonce: U256,
) -> Result<(), Error> {
if self.transactions.len() > MAX_QUEUE_LEN {
return Err(Error::QueueIsFull);
}
self.transactions.insert(
private_hash,
PrivateTransactionSigningDesc {
original_transaction: transaction.clone(),
validators: validators.clone(),
received_signatures: Vec::new(),
state,
contract_nonce,
},
);
Ok(())
}
/// Get copy of private transaction's description from the storage
pub fn get(&self, private_hash: &H256) -> Option<PrivateTransactionSigningDesc> {
self.transactions.get(private_hash).cloned()
}
/// Removes desc from the store (after verification is completed)
pub fn remove(&mut self, private_hash: &H256) -> Result<(), Error> {
self.transactions.remove(private_hash);
Ok(())
}
/// Adds received signature for the stored private transaction
pub fn add_signature(
&mut self,
private_hash: &H256,
signature: Signature,
) -> Result<(), Error> {
let desc = self
.transactions
.get_mut(private_hash)
.ok_or_else(|| Error::PrivateTransactionNotFound)?;
if !desc.received_signatures.contains(&signature) {
desc.received_signatures.push(signature);
}
Ok(())
}
}

421
ethcore/private-tx/tests/private_contract.rs
View File

@ -1,421 +0,0 @@
// 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/>.
//! Contract for private transactions tests.
extern crate common_types as types;
extern crate env_logger;
extern crate ethcore;
extern crate ethcore_io;
extern crate ethcore_private_tx;
extern crate ethkey;
extern crate keccak_hash as hash;
extern crate rustc_hex;
#[macro_use]
extern crate log;
use rustc_hex::{FromHex, ToHex};
use std::sync::Arc;
use ethcore::{
client::BlockChainClient,
executive::contract_address,
miner::Miner,
test_helpers::{generate_dummy_client, push_block_with_transactions},
CreateContractAddress,
};
use ethkey::{KeyPair, Secret, Signature};
use hash::keccak;
use types::{
ids::BlockId,
transaction::{Action, Transaction},
};
use ethcore_private_tx::{NoopEncryptor, Provider, ProviderConfig, StoringKeyProvider};
#[test]
fn private_contract() {
// This uses a simple private contract: contract Test1 { bytes32 public x; function setX(bytes32 _x) { x = _x; } }
let _ = ::env_logger::try_init();
let client = generate_dummy_client(0);
let chain_id = client.signing_chain_id();
let key1 = KeyPair::from_secret(Secret::from(
"0000000000000000000000000000000000000000000000000000000000000011",
))
.unwrap();
let _key2 = KeyPair::from_secret(Secret::from(
"0000000000000000000000000000000000000000000000000000000000000012",
))
.unwrap();
let key3 = KeyPair::from_secret(Secret::from(
"0000000000000000000000000000000000000000000000000000000000000013",
))
.unwrap();
let key4 = KeyPair::from_secret(Secret::from(
"0000000000000000000000000000000000000000000000000000000000000014",
))
.unwrap();
let signer = Arc::new(ethcore_private_tx::KeyPairSigner(vec![
key1.clone(),
key3.clone(),
key4.clone(),
]));
let config = ProviderConfig {
validator_accounts: vec![key3.address(), key4.address()],
signer_account: None,
};
let io = ethcore_io::IoChannel::disconnected();
let miner = Arc::new(Miner::new_for_tests(
&::ethcore::spec::Spec::new_test(),
None,
));
let private_keys = Arc::new(StoringKeyProvider::default());
let pm = Arc::new(Provider::new(
client.clone(),
miner,
signer.clone(),
Box::new(NoopEncryptor::default()),
config,
io,
private_keys,
));
let (address, _) = contract_address(
CreateContractAddress::FromSenderAndNonce,
&key1.address(),
&0.into(),
&[],
);
trace!("Creating private contract");
let private_contract_test = "6060604052341561000f57600080fd5b60d88061001d6000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630c55699c146046578063bc64b76d14607457600080fd5b3415605057600080fd5b60566098565b60405180826000191660001916815260200191505060405180910390f35b3415607e57600080fd5b6096600480803560001916906020019091905050609e565b005b60005481565b8060008160001916905550505600a165627a7a723058206acbdf4b15ca4c2d43e1b1879b830451a34f1e9d02ff1f2f394d8d857e79d2080029".from_hex().unwrap();
let mut private_create_tx = Transaction::default();
private_create_tx.action = Action::Create;
private_create_tx.data = private_contract_test;
private_create_tx.gas = 200000.into();
let private_create_tx_signed = private_create_tx.sign(&key1.secret(), None);
let validators = vec![key3.address(), key4.address()];
let (public_tx, _) = pm
.public_creation_transaction(
BlockId::Latest,
&private_create_tx_signed,
&validators,
0.into(),
)
.unwrap();
let public_tx = public_tx.sign(&key1.secret(), chain_id);
trace!("Transaction created. Pushing block");
push_block_with_transactions(&client, &[public_tx]);
trace!("Querying default private state");
let mut query_tx = Transaction::default();
query_tx.action = Action::Call(address.clone());
query_tx.data = "0c55699c".from_hex().unwrap(); // getX
query_tx.gas = 50000.into();
query_tx.nonce = 1.into();
let query_tx = query_tx.sign(&key1.secret(), chain_id);
let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
assert_eq!(
&result.output[..],
&("0000000000000000000000000000000000000000000000000000000000000000"
.from_hex()
.unwrap()[..])
);
assert_eq!(
pm.get_validators(BlockId::Latest, &address).unwrap(),
validators
);
trace!("Modifying private state");
let mut private_tx = Transaction::default();
private_tx.action = Action::Call(address.clone());
private_tx.data = "bc64b76d2a00000000000000000000000000000000000000000000000000000000000000"
.from_hex()
.unwrap(); //setX(42)
private_tx.gas = 120000.into();
private_tx.nonce = 1.into();
let private_tx = private_tx.sign(&key1.secret(), None);
let private_contract_nonce = pm.get_contract_nonce(&address, BlockId::Latest).unwrap();
let private_state = pm
.execute_private_transaction(BlockId::Latest, &private_tx)
.unwrap();
let nonced_state_hash = pm.calculate_state_hash(&private_state, private_contract_nonce);
let signatures: Vec<_> = [&key3, &key4]
.iter()
.map(|k| {
Signature::from(
::ethkey::sign(&k.secret(), &nonced_state_hash)
.unwrap()
.into_electrum(),
)
})
.collect();
let public_tx = pm
.public_transaction(private_state, &private_tx, &signatures, 1.into(), 0.into())
.unwrap();
let public_tx = public_tx.sign(&key1.secret(), chain_id);
push_block_with_transactions(&client, &[public_tx]);
trace!("Querying private state");
let mut query_tx = Transaction::default();
query_tx.action = Action::Call(address.clone());
query_tx.data = "0c55699c".from_hex().unwrap(); // getX
query_tx.gas = 50000.into();
query_tx.nonce = 2.into();
let query_tx = query_tx.sign(&key1.secret(), chain_id);
let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
assert_eq!(
&result.output[..],
&("2a00000000000000000000000000000000000000000000000000000000000000"
.from_hex()
.unwrap()[..])
);
assert_eq!(
pm.get_validators(BlockId::Latest, &address).unwrap(),
validators
);
// Now try modification with just one signature
trace!("Modifying private state");
let mut private_tx = Transaction::default();
private_tx.action = Action::Call(address.clone());
private_tx.data = "bc64b76d2b00000000000000000000000000000000000000000000000000000000000000"
.from_hex()
.unwrap(); //setX(43)
private_tx.gas = 120000.into();
private_tx.nonce = 2.into();
let private_tx = private_tx.sign(&key1.secret(), None);
let private_state = pm
.execute_private_transaction(BlockId::Latest, &private_tx)
.unwrap();
let private_state_hash = keccak(&private_state);
let signatures: Vec<_> = [&key4]
.iter()
.map(|k| {
Signature::from(
::ethkey::sign(&k.secret(), &private_state_hash)
.unwrap()
.into_electrum(),
)
})
.collect();
let public_tx = pm
.public_transaction(private_state, &private_tx, &signatures, 2.into(), 0.into())
.unwrap();
let public_tx = public_tx.sign(&key1.secret(), chain_id);
push_block_with_transactions(&client, &[public_tx]);
trace!("Querying private state");
let mut query_tx = Transaction::default();
query_tx.action = Action::Call(address.clone());
query_tx.data = "0c55699c".from_hex().unwrap(); // getX
query_tx.gas = 50000.into();
query_tx.nonce = 3.into();
let query_tx = query_tx.sign(&key1.secret(), chain_id);
let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
assert_eq!(
result.output,
"2a00000000000000000000000000000000000000000000000000000000000000"
.from_hex()
.unwrap()
);
}
#[test]
fn call_other_private_contract() {
// This test verifies calls private contract methods from another one
// Two contract will be deployed
// The same contract A:
// contract Test1 {
// bytes32 public x;
// function setX(bytes32 _x) {
// x = _x;
// }
// }
// And the following contract B:
// contract Deployed {
// function setX(uint) {}
// function x() returns (uint) {}
//}
// contract Existing {
// Deployed dc;
// function Existing(address t) {
// dc = Deployed(t);
// }
// function getX() returns (uint) {
// return dc.x();
// }
// }
//ethcore_logger::init_log();
// Create client and provider
let client = generate_dummy_client(0);
let chain_id = client.signing_chain_id();
let key1 = KeyPair::from_secret(Secret::from(
"0000000000000000000000000000000000000000000000000000000000000011",
))
.unwrap();
let _key2 = KeyPair::from_secret(Secret::from(
"0000000000000000000000000000000000000000000000000000000000000012",
))
.unwrap();
let key3 = KeyPair::from_secret(Secret::from(
"0000000000000000000000000000000000000000000000000000000000000013",
))
.unwrap();
let key4 = KeyPair::from_secret(Secret::from(
"0000000000000000000000000000000000000000000000000000000000000014",
))
.unwrap();
let signer = Arc::new(ethcore_private_tx::KeyPairSigner(vec![
key1.clone(),
key3.clone(),
key4.clone(),
]));
let config = ProviderConfig {
validator_accounts: vec![key3.address(), key4.address()],
signer_account: None,
};
let io = ethcore_io::IoChannel::disconnected();
let miner = Arc::new(Miner::new_for_tests(
&::ethcore::spec::Spec::new_test(),
None,
));
let private_keys = Arc::new(StoringKeyProvider::default());
let pm = Arc::new(Provider::new(
client.clone(),
miner,
signer.clone(),
Box::new(NoopEncryptor::default()),
config,
io,
private_keys.clone(),
));
// Deploy contract A
let (address_a, _) = contract_address(
CreateContractAddress::FromSenderAndNonce,
&key1.address(),
&0.into(),
&[],
);
trace!("Creating private contract A");
let private_contract_a_test = "6060604052341561000f57600080fd5b60d88061001d6000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630c55699c146046578063bc64b76d14607457600080fd5b3415605057600080fd5b60566098565b60405180826000191660001916815260200191505060405180910390f35b3415607e57600080fd5b6096600480803560001916906020019091905050609e565b005b60005481565b8060008160001916905550505600a165627a7a723058206acbdf4b15ca4c2d43e1b1879b830451a34f1e9d02ff1f2f394d8d857e79d2080029".from_hex().unwrap();
let mut private_create_tx1 = Transaction::default();
private_create_tx1.action = Action::Create;
private_create_tx1.data = private_contract_a_test;
private_create_tx1.gas = 200000.into();
private_create_tx1.nonce = 0.into();
let private_create_tx_signed = private_create_tx1.sign(&key1.secret(), None);
let validators = vec![key3.address(), key4.address()];
let (public_tx1, _) = pm
.public_creation_transaction(
BlockId::Latest,
&private_create_tx_signed,
&validators,
0.into(),
)
.unwrap();
let public_tx1 = public_tx1.sign(&key1.secret(), chain_id);
trace!("Transaction created. Pushing block");
push_block_with_transactions(&client, &[public_tx1]);
// Deploy contract B
let (address_b, _) = contract_address(
CreateContractAddress::FromSenderAndNonce,
&key1.address(),
&1.into(),
&[],
);
trace!("Creating private contract B");
// Build constructor data
let mut deploy_data = "6060604052341561000f57600080fd5b6040516020806101c583398101604052808051906020019091905050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505061014a8061007b6000396000f300606060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680635197c7aa14610046575b600080fd5b341561005157600080fd5b61005961006f565b6040518082815260200191505060405180910390f35b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16630c55699c6000604051602001526040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15156100fe57600080fd5b6102c65a03f1151561010f57600080fd5b505050604051805190509050905600a165627a7a723058207f8994e02725b47d76ec73e5c54a338d27b306dd1c830276bff2d75fcd1a5c920029000000000000000000000000".to_string();
deploy_data.push_str(&address_a.to_vec().to_hex());
let private_contract_b_test = deploy_data.from_hex().unwrap();
let mut private_create_tx2 = Transaction::default();
private_create_tx2.action = Action::Create;
private_create_tx2.data = private_contract_b_test;
private_create_tx2.gas = 200000.into();
private_create_tx2.nonce = 1.into();
let private_create_tx_signed = private_create_tx2.sign(&key1.secret(), None);
let (public_tx2, _) = pm
.public_creation_transaction(
BlockId::Latest,
&private_create_tx_signed,
&validators,
0.into(),
)
.unwrap();
let public_tx2 = public_tx2.sign(&key1.secret(), chain_id);
trace!("Transaction created. Pushing block");
push_block_with_transactions(&client, &[public_tx2]);
// Let provider know, that it has access to both keys for A and B
private_keys.set_available_keys(&vec![address_a, address_b]);
// Call A.setx(42)
trace!("Modifying private state");
let mut private_tx = Transaction::default();
private_tx.action = Action::Call(address_a.clone());
private_tx.data = "bc64b76d2a00000000000000000000000000000000000000000000000000000000000000"
.from_hex()
.unwrap(); //setX(42)
private_tx.gas = 120000.into();
private_tx.nonce = 2.into();
let private_tx = private_tx.sign(&key1.secret(), None);
let private_contract_nonce = pm.get_contract_nonce(&address_b, BlockId::Latest).unwrap();
let private_state = pm
.execute_private_transaction(BlockId::Latest, &private_tx)
.unwrap();
let nonced_state_hash = pm.calculate_state_hash(&private_state, private_contract_nonce);
let signatures: Vec<_> = [&key3, &key4]
.iter()
.map(|k| {
Signature::from(
::ethkey::sign(&k.secret(), &nonced_state_hash)
.unwrap()
.into_electrum(),
)
})
.collect();
let public_tx = pm
.public_transaction(private_state, &private_tx, &signatures, 2.into(), 0.into())
.unwrap();
let public_tx = public_tx.sign(&key1.secret(), chain_id);
push_block_with_transactions(&client, &[public_tx]);
// Call B.getX()
trace!("Querying private state");
let mut query_tx = Transaction::default();
query_tx.action = Action::Call(address_b.clone());
query_tx.data = "5197c7aa".from_hex().unwrap(); // getX
query_tx.gas = 50000.into();
query_tx.nonce = 3.into();
let query_tx = query_tx.sign(&key1.secret(), chain_id);
let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
assert_eq!(
&result.output[..],
&("2a00000000000000000000000000000000000000000000000000000000000000"
.from_hex()
.unwrap()[..])
);
}

1
ethcore/service/Cargo.toml
View File

@ -10,7 +10,6 @@ error-chain = { version = "0.12", default-features = false }
ethcore = { path = ".." } ethcore = { path = ".." }
ethcore-blockchain = { path = "../blockchain" } ethcore-blockchain = { path = "../blockchain" }
ethcore-io = { path = "../../util/io" } ethcore-io = { path = "../../util/io" }
ethcore-private-tx = { path = "../private-tx" }
ethcore-sync = { path = "../sync" } ethcore-sync = { path = "../sync" }
ethereum-types = "0.4" ethereum-types = "0.4"
kvdb = "0.1" kvdb = "0.1"

2
ethcore/service/src/error.rs
View File

@ -19,13 +19,11 @@
#![allow(deprecated)] #![allow(deprecated)]
use ethcore; use ethcore;
use ethcore_private_tx;
use io; use io;
error_chain! { error_chain! {
foreign_links { foreign_links {
Ethcore(ethcore::error::Error); Ethcore(ethcore::error::Error);
IoError(io::IoError); IoError(io::IoError);
PrivateTransactions(ethcore_private_tx::Error);
} }
} }

3
ethcore/service/src/lib.rs
View File

@ -18,7 +18,6 @@ extern crate ansi_term;
extern crate ethcore; extern crate ethcore;
extern crate ethcore_blockchain as blockchain; extern crate ethcore_blockchain as blockchain;
extern crate ethcore_io as io; extern crate ethcore_io as io;
extern crate ethcore_private_tx;
extern crate ethcore_sync as sync; extern crate ethcore_sync as sync;
extern crate ethereum_types; extern crate ethereum_types;
extern crate kvdb; extern crate kvdb;
@ -43,4 +42,4 @@ mod stop_guard;
extern crate kvdb_rocksdb; extern crate kvdb_rocksdb;
pub use error::{Error, ErrorKind}; pub use error::{Error, ErrorKind};
pub use service::{ClientService, PrivateTxService}; pub use service::ClientService;

72
ethcore/service/src/service.rs
View File

@ -19,7 +19,6 @@
use std::{path::Path, sync::Arc, time::Duration}; use std::{path::Path, sync::Arc, time::Duration};
use ansi_term::Colour; use ansi_term::Colour;
use ethereum_types::H256;
use io::{IoContext, IoError, IoHandler, IoService, TimerToken}; use io::{IoContext, IoError, IoHandler, IoService, TimerToken};
use stop_guard::StopGuard; use stop_guard::StopGuard;
@ -34,54 +33,14 @@ use ethcore::{
}, },
spec::Spec, spec::Spec,
}; };
use sync::PrivateTxHandler;
use ethcore_private_tx::{self, Importer, Signer};
use Error; use Error;
pub struct PrivateTxService {
provider: Arc<ethcore_private_tx::Provider>,
}
impl PrivateTxService {
fn new(provider: Arc<ethcore_private_tx::Provider>) -> Self {
PrivateTxService { provider }
}
/// Returns underlying provider.
pub fn provider(&self) -> Arc<ethcore_private_tx::Provider> {
self.provider.clone()
}
}
impl PrivateTxHandler for PrivateTxService {
fn import_private_transaction(&self, rlp: &[u8]) -> Result<H256, String> {
match self.provider.import_private_transaction(rlp) {
Ok(import_result) => Ok(import_result),
Err(err) => {
warn!(target: "privatetx", "Unable to import private transaction packet: {}", err);
bail!(err.to_string())
}
}
}
fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<H256, String> {
match self.provider.import_signed_private_transaction(rlp) {
Ok(import_result) => Ok(import_result),
Err(err) => {
warn!(target: "privatetx", "Unable to import signed private transaction packet: {}", err);
bail!(err.to_string())
}
}
}
}
/// Client service setup. Creates and registers client and network services with the IO subsystem. /// Client service setup. Creates and registers client and network services with the IO subsystem.
pub struct ClientService { pub struct ClientService {
io_service: Arc<IoService<ClientIoMessage>>, io_service: Arc<IoService<ClientIoMessage>>,
client: Arc<Client>, client: Arc<Client>,
snapshot: Arc<SnapshotService>, snapshot: Arc<SnapshotService>,
private_tx: Arc<PrivateTxService>,
database: Arc<dyn BlockChainDB>, database: Arc<dyn BlockChainDB>,
_stop_guard: StopGuard, _stop_guard: StopGuard,
} }
@ -96,10 +55,6 @@ impl ClientService {
restoration_db_handler: Box<dyn BlockChainDBHandler>, restoration_db_handler: Box<dyn BlockChainDBHandler>,
_ipc_path: &Path, _ipc_path: &Path,
miner: Arc<Miner>, miner: Arc<Miner>,
signer: Arc<dyn Signer>,
encryptor: Box<dyn ethcore_private_tx::Encryptor>,
private_tx_conf: ethcore_private_tx::ProviderConfig,
private_encryptor_conf: ethcore_private_tx::EncryptorConfig,
) -> Result<ClientService, Error> { ) -> Result<ClientService, Error> {
let io_service = IoService::<ClientIoMessage>::start()?; let io_service = IoService::<ClientIoMessage>::start()?;
@ -131,21 +86,6 @@ impl ClientService {
}; };
let snapshot = Arc::new(SnapshotService::new(snapshot_params)?); let snapshot = Arc::new(SnapshotService::new(snapshot_params)?);
let private_keys = Arc::new(ethcore_private_tx::SecretStoreKeys::new(
client.clone(),
private_encryptor_conf.key_server_account,
));
let provider = Arc::new(ethcore_private_tx::Provider::new(
client.clone(),
miner,
signer,
encryptor,
private_tx_conf,
io_service.channel(),
private_keys,
));
let private_tx = Arc::new(PrivateTxService::new(provider));
let client_io = Arc::new(ClientIoHandler { let client_io = Arc::new(ClientIoHandler {
client: client.clone(), client: client.clone(),
snapshot: snapshot.clone(), snapshot: snapshot.clone(),
@ -160,7 +100,6 @@ impl ClientService {
io_service: Arc::new(io_service), io_service: Arc::new(io_service),
client: client, client: client,
snapshot: snapshot, snapshot: snapshot,
private_tx,
database: blockchain_db, database: blockchain_db,
_stop_guard: stop_guard, _stop_guard: stop_guard,
}) })
@ -184,11 +123,6 @@ impl ClientService {
self.snapshot.clone() self.snapshot.clone()
} }
/// Get private transaction service.
pub fn private_tx_service(&self) -> Arc<PrivateTxService> {
self.private_tx.clone()
}
/// Get network service component /// Get network service component
pub fn io(&self) -> Arc<IoService<ClientIoMessage>> { pub fn io(&self) -> Arc<IoService<ClientIoMessage>> {
self.io_service.clone() self.io_service.clone()
@ -309,8 +243,6 @@ mod tests {
use ethcore_db::NUM_COLUMNS; use ethcore_db::NUM_COLUMNS;
use kvdb_rocksdb::{CompactionProfile, DatabaseConfig}; use kvdb_rocksdb::{CompactionProfile, DatabaseConfig};
use ethcore_private_tx;
#[test] #[test]
fn it_can_be_started() { fn it_can_be_started() {
let tempdir = TempDir::new("").unwrap(); let tempdir = TempDir::new("").unwrap();
@ -336,10 +268,6 @@ mod tests {
restoration_db_handler, restoration_db_handler,
tempdir.path(), tempdir.path(),
Arc::new(Miner::new_for_tests(&spec, None)), Arc::new(Miner::new_for_tests(&spec, None)),
Arc::new(ethcore_private_tx::DummySigner),
Box::new(ethcore_private_tx::NoopEncryptor),
Default::default(),
Default::default(),
); );
assert!(service.is_ok()); assert!(service.is_ok());
drop(service.unwrap()); drop(service.unwrap());

4
ethcore/src/client/chain_notify.rs
View File

@ -24,10 +24,6 @@ use types::transaction::UnverifiedTransaction;
pub enum ChainMessageType { pub enum ChainMessageType {
/// Consensus message /// Consensus message
Consensus(Vec<u8>), Consensus(Vec<u8>),
/// Message with private transaction
PrivateTransaction(H256, Vec<u8>),
/// Message with signed private transaction
SignedPrivateTransaction(H256, Vec<u8>),
} }
/// Route type to indicate whether it is enacted or retracted. /// Route type to indicate whether it is enacted or retracted.

1
ethcore/src/client/mod.rs
View File

@ -60,4 +60,3 @@ pub use verification::VerifierType;
pub mod traits; pub mod traits;
mod chain_notify; mod chain_notify;
mod private_notify;

23
ethcore/src/client/private_notify.rs
View File

@ -1,23 +0,0 @@
// 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 error::TransactionImportError;
/// Represent private transactions handler inside the client
pub trait PrivateNotify: Send + Sync {
/// fires when private transaction message queued via client io queue
fn private_transaction_queued(&self) -> Result<(), TransactionImportError>;
}

2
ethcore/src/test_helpers.rs
View File

@ -614,8 +614,6 @@ impl ChainNotify for TestNotify {
fn broadcast(&self, message: ChainMessageType) { fn broadcast(&self, message: ChainMessageType) {
let data = match message { let data = match message {
ChainMessageType::Consensus(data) => data, ChainMessageType::Consensus(data) => data,
ChainMessageType::SignedPrivateTransaction(_, data) => data,
ChainMessageType::PrivateTransaction(_, data) => data,
}; };
self.messages.write().push(data); self.messages.write().push(data);
} }

1
ethcore/sync/Cargo.toml
View File

@ -36,6 +36,5 @@ triehash-ethereum = {version = "0.2", path = "../../util/triehash-ethereum" }
env_logger = "0.5" env_logger = "0.5"
ethcore = { path = "..", features = ["test-helpers"] } ethcore = { path = "..", features = ["test-helpers"] }
ethcore-io = { path = "../../util/io", features = ["mio"] } ethcore-io = { path = "../../util/io", features = ["mio"] }
ethcore-private-tx = { path = "../private-tx" }
kvdb-memorydb = "0.1" kvdb-memorydb = "0.1"
rustc-hex = "1.0" rustc-hex = "1.0"

35
ethcore/sync/src/api.rs
View File

@ -30,9 +30,8 @@ use std::{
}; };
use chain::{ use chain::{
sync_packet::SyncPacket::{PrivateTransactionPacket, SignedPrivateTransactionPacket},
ChainSyncApi, SyncStatus as EthSyncStatus, ETH_PROTOCOL_VERSION_62, ETH_PROTOCOL_VERSION_63, ChainSyncApi, SyncStatus as EthSyncStatus, ETH_PROTOCOL_VERSION_62, ETH_PROTOCOL_VERSION_63,
PAR_PROTOCOL_VERSION_1, PAR_PROTOCOL_VERSION_2, PAR_PROTOCOL_VERSION_3, PAR_PROTOCOL_VERSION_1, PAR_PROTOCOL_VERSION_2,
}; };
use ethcore::{ use ethcore::{
client::{BlockChainClient, ChainMessageType, ChainNotify, NewBlocks}, client::{BlockChainClient, ChainMessageType, ChainNotify, NewBlocks},
@ -43,7 +42,6 @@ use ethkey::Secret;
use io::TimerToken; use io::TimerToken;
use network::IpFilter; use network::IpFilter;
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
use private_tx::PrivateTxHandler;
use std::{ use std::{
net::{AddrParseError, SocketAddr}, net::{AddrParseError, SocketAddr},
str::FromStr, str::FromStr,
@ -214,8 +212,6 @@ pub struct Params {
pub chain: Arc<dyn BlockChainClient>, pub chain: Arc<dyn BlockChainClient>,
/// Snapshot service. /// Snapshot service.
pub snapshot_service: Arc<dyn SnapshotService>, pub snapshot_service: Arc<dyn SnapshotService>,
/// Private tx service.
pub private_tx_handler: Option<Arc<dyn PrivateTxHandler>>,
/// Network layer configuration. /// Network layer configuration.
pub network_config: NetworkConfiguration, pub network_config: NetworkConfiguration,
} }
@ -239,12 +235,7 @@ impl EthSync {
connection_filter: Option<Arc<dyn ConnectionFilter>>, connection_filter: Option<Arc<dyn ConnectionFilter>>,
) -> Result<Arc<EthSync>, Error> { ) -> Result<Arc<EthSync>, Error> {
let (priority_tasks_tx, priority_tasks_rx) = mpsc::channel(); let (priority_tasks_tx, priority_tasks_rx) = mpsc::channel();
let sync = ChainSyncApi::new( let sync = ChainSyncApi::new(params.config, &*params.chain, priority_tasks_rx);
params.config,
&*params.chain,
params.private_tx_handler.as_ref().cloned(),
priority_tasks_rx,
);
let service = NetworkService::new( let service = NetworkService::new(
params.network_config.clone().into_basic()?, params.network_config.clone().into_basic()?,
connection_filter, connection_filter,
@ -463,11 +454,7 @@ impl ChainNotify for EthSync {
.register_protocol( .register_protocol(
self.eth_handler.clone(), self.eth_handler.clone(),
PAR_PROTOCOL, PAR_PROTOCOL,
&[ &[PAR_PROTOCOL_VERSION_1, PAR_PROTOCOL_VERSION_2],
PAR_PROTOCOL_VERSION_1,
PAR_PROTOCOL_VERSION_2,
PAR_PROTOCOL_VERSION_3,
],
) )
.unwrap_or_else(|e| warn!("Error registering snapshot sync protocol: {:?}", e)); .unwrap_or_else(|e| warn!("Error registering snapshot sync protocol: {:?}", e));
} }
@ -491,22 +478,6 @@ impl ChainNotify for EthSync {
.sync .sync
.write() .write()
.propagate_consensus_packet(&mut sync_io, message), .propagate_consensus_packet(&mut sync_io, message),
ChainMessageType::PrivateTransaction(transaction_hash, message) => {
self.eth_handler.sync.write().propagate_private_transaction(
&mut sync_io,
transaction_hash,
PrivateTransactionPacket,
message,
)
}
ChainMessageType::SignedPrivateTransaction(transaction_hash, message) => {
self.eth_handler.sync.write().propagate_private_transaction(
&mut sync_io,
transaction_hash,
SignedPrivateTransactionPacket,
message,
)
}
} }
}); });
} }

92
ethcore/sync/src/chain/handler.rs
View File

@ -36,15 +36,14 @@ use super::sync_packet::{
PacketInfo, SyncPacket, PacketInfo, SyncPacket,
SyncPacket::{ SyncPacket::{
BlockBodiesPacket, BlockHeadersPacket, NewBlockHashesPacket, NewBlockPacket, BlockBodiesPacket, BlockHeadersPacket, NewBlockHashesPacket, NewBlockPacket,
PrivateTransactionPacket, ReceiptsPacket, SignedPrivateTransactionPacket, ReceiptsPacket, SnapshotDataPacket, SnapshotManifestPacket, StatusPacket,
SnapshotDataPacket, SnapshotManifestPacket, StatusPacket,
}, },
}; };
use super::{ use super::{
BlockSet, ChainSync, ForkConfirmation, PacketDecodeError, PeerAsking, PeerInfo, SyncRequester, BlockSet, ChainSync, ForkConfirmation, PacketDecodeError, PeerAsking, PeerInfo, SyncRequester,
SyncState, ETH_PROTOCOL_VERSION_62, ETH_PROTOCOL_VERSION_63, MAX_NEW_BLOCK_AGE, MAX_NEW_HASHES, SyncState, ETH_PROTOCOL_VERSION_62, ETH_PROTOCOL_VERSION_63, MAX_NEW_BLOCK_AGE, MAX_NEW_HASHES,
PAR_PROTOCOL_VERSION_1, PAR_PROTOCOL_VERSION_3, PAR_PROTOCOL_VERSION_1, PAR_PROTOCOL_VERSION_2,
}; };
/// The Chain Sync Handler: handles responses from peers /// The Chain Sync Handler: handles responses from peers
@ -70,12 +69,6 @@ impl SyncHandler {
NewBlockHashesPacket => SyncHandler::on_peer_new_hashes(sync, io, peer, &rlp), NewBlockHashesPacket => SyncHandler::on_peer_new_hashes(sync, io, peer, &rlp),
SnapshotManifestPacket => SyncHandler::on_snapshot_manifest(sync, io, peer, &rlp), SnapshotManifestPacket => SyncHandler::on_snapshot_manifest(sync, io, peer, &rlp),
SnapshotDataPacket => SyncHandler::on_snapshot_data(sync, io, peer, &rlp), SnapshotDataPacket => SyncHandler::on_snapshot_data(sync, io, peer, &rlp),
PrivateTransactionPacket => {
SyncHandler::on_private_transaction(sync, io, peer, &rlp)
}
SignedPrivateTransactionPacket => {
SyncHandler::on_signed_private_transaction(sync, io, peer, &rlp)
}
_ => { _ => {
debug!(target: "sync", "{}: Unknown packet {}", peer, packet_id.id()); debug!(target: "sync", "{}: Unknown packet {}", peer, packet_id.id());
Ok(()) Ok(())
@ -661,7 +654,6 @@ impl SyncHandler {
let protocol_version: u8 = r.val_at(0)?; let protocol_version: u8 = r.val_at(0)?;
let warp_protocol_version = io.protocol_version(&PAR_PROTOCOL, peer_id); let warp_protocol_version = io.protocol_version(&PAR_PROTOCOL, peer_id);
let warp_protocol = warp_protocol_version != 0; let warp_protocol = warp_protocol_version != 0;
let private_tx_protocol = warp_protocol_version >= PAR_PROTOCOL_VERSION_3.0;
let peer = PeerInfo { let peer = PeerInfo {
protocol_version: protocol_version, protocol_version: protocol_version,
network_id: r.val_at(1)?, network_id: r.val_at(1)?,
@ -673,7 +665,6 @@ impl SyncHandler {
asking_hash: None, asking_hash: None,
ask_time: Instant::now(), ask_time: Instant::now(),
last_sent_transactions: Default::default(), last_sent_transactions: Default::default(),
last_sent_private_transactions: Default::default(),
expired: false, expired: false,
confirmation: if sync.fork_block.is_none() { confirmation: if sync.fork_block.is_none() {
ForkConfirmation::Confirmed ForkConfirmation::Confirmed
@ -692,11 +683,6 @@ impl SyncHandler {
None None
}, },
block_set: None, block_set: None,
private_tx_enabled: if private_tx_protocol {
r.val_at(7).unwrap_or(false)
} else {
false
},
client_version: ClientVersion::from(io.peer_version(peer_id)), client_version: ClientVersion::from(io.peer_version(peer_id)),
}; };
@ -706,16 +692,14 @@ impl SyncHandler {
difficulty: {:?}, \ difficulty: {:?}, \
latest:{}, \ latest:{}, \
genesis:{}, \ genesis:{}, \
snapshot:{:?}, \ snapshot:{:?})",
private_tx_enabled:{})",
peer_id, peer_id,
peer.protocol_version, peer.protocol_version,
peer.network_id, peer.network_id,
peer.difficulty, peer.difficulty,
peer.latest_hash, peer.latest_hash,
peer.genesis, peer.genesis,
peer.snapshot_number, peer.snapshot_number
peer.private_tx_enabled
); );
if io.is_expired() { if io.is_expired() {
trace!(target: "sync", "Status packet from expired session {}:{}", peer_id, io.peer_version(peer_id)); trace!(target: "sync", "Status packet from expired session {}:{}", peer_id, io.peer_version(peer_id));
@ -739,7 +723,7 @@ impl SyncHandler {
if false if false
|| (warp_protocol || (warp_protocol
&& (peer.protocol_version < PAR_PROTOCOL_VERSION_1.0 && (peer.protocol_version < PAR_PROTOCOL_VERSION_1.0
|| peer.protocol_version > PAR_PROTOCOL_VERSION_3.0)) || peer.protocol_version > PAR_PROTOCOL_VERSION_2.0))
|| (!warp_protocol || (!warp_protocol
&& (peer.protocol_version < ETH_PROTOCOL_VERSION_62.0 && (peer.protocol_version < ETH_PROTOCOL_VERSION_62.0
|| peer.protocol_version > ETH_PROTOCOL_VERSION_63.0)) || peer.protocol_version > ETH_PROTOCOL_VERSION_63.0))
@ -795,72 +779,6 @@ impl SyncHandler {
io.chain().queue_transactions(transactions, peer_id); io.chain().queue_transactions(transactions, peer_id);
Ok(()) Ok(())
} }
/// Called when peer sends us signed private transaction packet
fn on_signed_private_transaction(
sync: &mut ChainSync,
_io: &mut dyn SyncIo,
peer_id: PeerId,
r: &Rlp,
) -> Result<(), DownloaderImportError> {
if !sync.peers.get(&peer_id).map_or(false, |p| p.can_sync()) {
trace!(target: "sync", "{} Ignoring packet from unconfirmed/unknown peer", peer_id);
return Ok(());
}
let private_handler = match sync.private_tx_handler {
Some(ref handler) => handler,
None => {
trace!(target: "sync", "{} Ignoring private tx packet from peer", peer_id);
return Ok(());
}
};
trace!(target: "sync", "Received signed private transaction packet from {:?}", peer_id);
match private_handler.import_signed_private_transaction(r.as_raw()) {
Ok(transaction_hash) => {
//don't send the packet back
if let Some(ref mut peer) = sync.peers.get_mut(&peer_id) {
peer.last_sent_private_transactions.insert(transaction_hash);
}
}
Err(e) => {
trace!(target: "sync", "Ignoring the message, error queueing: {}", e);
}
}
Ok(())
}
/// Called when peer sends us new private transaction packet
fn on_private_transaction(
sync: &mut ChainSync,
_io: &mut dyn SyncIo,
peer_id: PeerId,
r: &Rlp,
) -> Result<(), DownloaderImportError> {
if !sync.peers.get(&peer_id).map_or(false, |p| p.can_sync()) {
trace!(target: "sync", "{} Ignoring packet from unconfirmed/unknown peer", peer_id);
return Ok(());
}
let private_handler = match sync.private_tx_handler {
Some(ref handler) => handler,
None => {
trace!(target: "sync", "{} Ignoring private tx packet from peer", peer_id);
return Ok(());
}
};
trace!(target: "sync", "Received private transaction packet from {:?}", peer_id);
match private_handler.import_private_transaction(r.as_raw()) {
Ok(transaction_hash) => {
//don't send the packet back
if let Some(ref mut peer) = sync.peers.get_mut(&peer_id) {
peer.last_sent_private_transactions.insert(transaction_hash);
}
}
Err(e) => {
trace!(target: "sync", "Ignoring the message, error queueing: {}", e);
}
}
Ok(())
}
} }
#[cfg(test)] #[cfg(test)]

69
ethcore/sync/src/chain/mod.rs
View File

@ -107,14 +107,13 @@ use hash::keccak;
use heapsize::HeapSizeOf; use heapsize::HeapSizeOf;
use network::{self, client_version::ClientVersion, PacketId, PeerId}; use network::{self, client_version::ClientVersion, PacketId, PeerId};
use parking_lot::{Mutex, RwLock, RwLockWriteGuard}; use parking_lot::{Mutex, RwLock, RwLockWriteGuard};
use private_tx::PrivateTxHandler;
use rand::Rng; use rand::Rng;
use rlp::{DecoderError, RlpStream}; use rlp::{DecoderError, RlpStream};
use snapshot::Snapshot; use snapshot::Snapshot;
use std::{ use std::{
cmp, cmp,
collections::{BTreeMap, HashMap, HashSet}, collections::{BTreeMap, HashMap, HashSet},
sync::{mpsc, Arc}, sync::mpsc,
time::{Duration, Instant}, time::{Duration, Instant},
}; };
use sync_io::SyncIo; use sync_io::SyncIo;
@ -124,7 +123,7 @@ use types::{transaction::UnverifiedTransaction, BlockNumber};
use self::{ use self::{
handler::SyncHandler, handler::SyncHandler,
sync_packet::{ sync_packet::{
PacketInfo, SyncPacket, PacketInfo,
SyncPacket::{NewBlockPacket, StatusPacket}, SyncPacket::{NewBlockPacket, StatusPacket},
}, },
}; };
@ -144,8 +143,6 @@ pub const ETH_PROTOCOL_VERSION_62: (u8, u8) = (62, 0x11);
pub const PAR_PROTOCOL_VERSION_1: (u8, u8) = (1, 0x15); pub const PAR_PROTOCOL_VERSION_1: (u8, u8) = (1, 0x15);
/// 2 version of Parity protocol (consensus messages added). /// 2 version of Parity protocol (consensus messages added).
pub const PAR_PROTOCOL_VERSION_2: (u8, u8) = (2, 0x16); pub const PAR_PROTOCOL_VERSION_2: (u8, u8) = (2, 0x16);
/// 3 version of Parity protocol (private transactions messages added).
pub const PAR_PROTOCOL_VERSION_3: (u8, u8) = (3, 0x18);
pub const MAX_BODIES_TO_SEND: usize = 256; pub const MAX_BODIES_TO_SEND: usize = 256;
pub const MAX_HEADERS_TO_SEND: usize = 512; pub const MAX_HEADERS_TO_SEND: usize = 512;
@ -318,12 +315,8 @@ pub struct PeerInfo {
ask_time: Instant, ask_time: Instant,
/// Holds a set of transactions recently sent to this peer to avoid spamming. /// Holds a set of transactions recently sent to this peer to avoid spamming.
last_sent_transactions: H256FastSet, last_sent_transactions: H256FastSet,
/// Holds a set of private transactions and their signatures recently sent to this peer to avoid spamming.
last_sent_private_transactions: H256FastSet,
/// Pending request is expired and result should be ignored /// Pending request is expired and result should be ignored
expired: bool, expired: bool,
/// Private transactions enabled
private_tx_enabled: bool,
/// Peer fork confirmation status /// Peer fork confirmation status
confirmation: ForkConfirmation, confirmation: ForkConfirmation,
/// Best snapshot hash /// Best snapshot hash
@ -353,10 +346,6 @@ impl PeerInfo {
self.expired = true; self.expired = true;
} }
} }
fn reset_private_stats(&mut self) {
self.last_sent_private_transactions.clear();
}
} }
#[cfg(not(test))] #[cfg(not(test))]
@ -392,11 +381,10 @@ impl ChainSyncApi {
pub fn new( pub fn new(
config: SyncConfig, config: SyncConfig,
chain: &dyn BlockChainClient, chain: &dyn BlockChainClient,
private_tx_handler: Option<Arc<dyn PrivateTxHandler>>,
priority_tasks: mpsc::Receiver<PriorityTask>, priority_tasks: mpsc::Receiver<PriorityTask>,
) -> Self { ) -> Self {
ChainSyncApi { ChainSyncApi {
sync: RwLock::new(ChainSync::new(config, chain, private_tx_handler)), sync: RwLock::new(ChainSync::new(config, chain)),
priority_tasks: Mutex::new(priority_tasks), priority_tasks: Mutex::new(priority_tasks),
} }
} }
@ -640,19 +628,13 @@ pub struct ChainSync {
transactions_stats: TransactionsStats, transactions_stats: TransactionsStats,
/// Enable ancient block downloading /// Enable ancient block downloading
download_old_blocks: bool, download_old_blocks: bool,
/// Shared private tx service.
private_tx_handler: Option<Arc<dyn PrivateTxHandler>>,
/// Enable warp sync. /// Enable warp sync.
warp_sync: WarpSync, warp_sync: WarpSync,
} }
impl ChainSync { impl ChainSync {
/// Create a new instance of syncing strategy. /// Create a new instance of syncing strategy.
pub fn new( pub fn new(config: SyncConfig, chain: &dyn BlockChainClient) -> Self {
config: SyncConfig,
chain: &dyn BlockChainClient,
private_tx_handler: Option<Arc<dyn PrivateTxHandler>>,
) -> Self {
let chain_info = chain.chain_info(); let chain_info = chain.chain_info();
let best_block = chain.chain_info().best_block_number; let best_block = chain.chain_info().best_block_number;
let state = Self::get_init_state(config.warp_sync, chain); let state = Self::get_init_state(config.warp_sync, chain);
@ -677,7 +659,6 @@ impl ChainSync {
snapshot: Snapshot::new(), snapshot: Snapshot::new(),
sync_start_time: None, sync_start_time: None,
transactions_stats: TransactionsStats::default(), transactions_stats: TransactionsStats::default(),
private_tx_handler,
warp_sync: config.warp_sync, warp_sync: config.warp_sync,
}; };
sync.update_targets(chain); sync.update_targets(chain);
@ -1207,7 +1188,6 @@ impl ChainSync {
fn send_status(&mut self, io: &mut dyn SyncIo, peer: PeerId) -> Result<(), network::Error> { fn send_status(&mut self, io: &mut dyn SyncIo, peer: PeerId) -> Result<(), network::Error> {
let warp_protocol_version = io.protocol_version(&PAR_PROTOCOL, peer); let warp_protocol_version = io.protocol_version(&PAR_PROTOCOL, peer);
let warp_protocol = warp_protocol_version != 0; let warp_protocol = warp_protocol_version != 0;
let private_tx_protocol = warp_protocol_version >= PAR_PROTOCOL_VERSION_3.0;
let protocol = if warp_protocol { let protocol = if warp_protocol {
warp_protocol_version warp_protocol_version
} else { } else {
@ -1228,9 +1208,6 @@ impl ChainSync {
let manifest_hash = manifest.map_or(H256::new(), |m| keccak(m.into_rlp())); let manifest_hash = manifest.map_or(H256::new(), |m| keccak(m.into_rlp()));
packet.append(&manifest_hash); packet.append(&manifest_hash);
packet.append(&block_number); packet.append(&block_number);
if private_tx_protocol {
packet.append(&self.private_tx_handler.is_some());
}
} }
packet.complete_unbounded_list(); packet.complete_unbounded_list();
io.respond(StatusPacket.id(), packet.out()) io.respond(StatusPacket.id(), packet.out())
@ -1355,22 +1332,6 @@ impl ChainSync {
.collect() .collect()
} }
fn get_private_transaction_peers(&self, transaction_hash: &H256) -> Vec<PeerId> {
self.peers
.iter()
.filter_map(|(id, p)| {
if p.protocol_version >= PAR_PROTOCOL_VERSION_3.0
&& !p.last_sent_private_transactions.contains(transaction_hash)
&& p.private_tx_enabled
{
Some(*id)
} else {
None
}
})
.collect()
}
/// Maintain other peers. Send out any new blocks and transactions /// Maintain other peers. Send out any new blocks and transactions
pub fn maintain_sync(&mut self, io: &mut dyn SyncIo) { pub fn maintain_sync(&mut self, io: &mut dyn SyncIo) {
self.maybe_start_snapshot_sync(io); self.maybe_start_snapshot_sync(io);
@ -1407,7 +1368,6 @@ impl ChainSync {
trace!(target: "sync", "Re-broadcasting transactions to a random peer."); trace!(target: "sync", "Re-broadcasting transactions to a random peer.");
self.peers.values_mut().nth(peer).map(|peer_info| { self.peers.values_mut().nth(peer).map(|peer_info| {
peer_info.last_sent_transactions.clear(); peer_info.last_sent_transactions.clear();
peer_info.reset_private_stats()
}); });
} }
} }
@ -1443,23 +1403,6 @@ impl ChainSync {
pub fn propagate_consensus_packet(&mut self, io: &mut dyn SyncIo, packet: Bytes) { pub fn propagate_consensus_packet(&mut self, io: &mut dyn SyncIo, packet: Bytes) {
SyncPropagator::propagate_consensus_packet(self, io, packet); SyncPropagator::propagate_consensus_packet(self, io, packet);
} }
/// Broadcast private transaction message to peers.
pub fn propagate_private_transaction(
&mut self,
io: &mut dyn SyncIo,
transaction_hash: H256,
packet_id: SyncPacket,
packet: Bytes,
) {
SyncPropagator::propagate_private_transaction(
self,
io,
transaction_hash,
packet_id,
packet,
);
}
} }
#[cfg(test)] #[cfg(test)]
@ -1565,7 +1508,7 @@ pub mod tests {
peer_latest_hash: H256, peer_latest_hash: H256,
client: &dyn BlockChainClient, client: &dyn BlockChainClient,
) -> ChainSync { ) -> ChainSync {
let mut sync = ChainSync::new(SyncConfig::default(), client, None); let mut sync = ChainSync::new(SyncConfig::default(), client);
insert_dummy_peer(&mut sync, 0, peer_latest_hash); insert_dummy_peer(&mut sync, 0, peer_latest_hash);
sync sync
} }
@ -1584,9 +1527,7 @@ pub mod tests {
asking_hash: None, asking_hash: None,
ask_time: Instant::now(), ask_time: Instant::now(),
last_sent_transactions: Default::default(), last_sent_transactions: Default::default(),
last_sent_private_transactions: Default::default(),
expired: false, expired: false,
private_tx_enabled: false,
confirmation: super::ForkConfirmation::Confirmed, confirmation: super::ForkConfirmation::Confirmed,
snapshot_number: None, snapshot_number: None,
snapshot_hash: None, snapshot_hash: None,

33
ethcore/sync/src/chain/propagator.rs
View File

@ -328,29 +328,6 @@ impl SyncPropagator {
} }
} }
/// Broadcast private transaction message to peers.
pub fn propagate_private_transaction(
sync: &mut ChainSync,
io: &mut dyn SyncIo,
transaction_hash: H256,
packet_id: SyncPacket,
packet: Bytes,
) {
let lucky_peers =
ChainSync::select_random_peers(&sync.get_private_transaction_peers(&transaction_hash));
if lucky_peers.is_empty() {
error!(target: "privatetx", "Cannot propagate the packet, no peers with private tx enabled connected");
} else {
trace!(target: "privatetx", "Sending private transaction packet to {:?}", lucky_peers);
for peer_id in lucky_peers {
if let Some(ref mut peer) = sync.peers.get_mut(&peer_id) {
peer.last_sent_private_transactions.insert(transaction_hash);
}
SyncPropagator::send_packet(io, peer_id, packet_id, packet.clone());
}
}
}
fn select_peers_for_transactions<F>(sync: &ChainSync, filter: F) -> Vec<PeerId> fn select_peers_for_transactions<F>(sync: &ChainSync, filter: F) -> Vec<PeerId>
where where
F: Fn(&PeerId) -> bool, F: Fn(&PeerId) -> bool,
@ -473,7 +450,7 @@ mod tests {
client.add_blocks(2, EachBlockWith::Uncle); client.add_blocks(2, EachBlockWith::Uncle);
let queue = RwLock::new(VecDeque::new()); let queue = RwLock::new(VecDeque::new());
let block = client.block(BlockId::Latest).unwrap().into_inner(); let block = client.block(BlockId::Latest).unwrap().into_inner();
let mut sync = ChainSync::new(SyncConfig::default(), &client, None); let mut sync = ChainSync::new(SyncConfig::default(), &client);
sync.peers.insert( sync.peers.insert(
0, 0,
PeerInfo { PeerInfo {
@ -488,9 +465,7 @@ mod tests {
asking_hash: None, asking_hash: None,
ask_time: Instant::now(), ask_time: Instant::now(),
last_sent_transactions: Default::default(), last_sent_transactions: Default::default(),
last_sent_private_transactions: Default::default(),
expired: false, expired: false,
private_tx_enabled: false,
confirmation: ForkConfirmation::Confirmed, confirmation: ForkConfirmation::Confirmed,
snapshot_number: None, snapshot_number: None,
snapshot_hash: None, snapshot_hash: None,
@ -565,7 +540,7 @@ mod tests {
client.add_blocks(100, EachBlockWith::Uncle); client.add_blocks(100, EachBlockWith::Uncle);
client.insert_transaction_to_queue(); client.insert_transaction_to_queue();
// Sync with no peers // Sync with no peers
let mut sync = ChainSync::new(SyncConfig::default(), &client, None); let mut sync = ChainSync::new(SyncConfig::default(), &client);
let queue = RwLock::new(VecDeque::new()); let queue = RwLock::new(VecDeque::new());
let ss = TestSnapshotService::new(); let ss = TestSnapshotService::new();
let mut io = TestIo::new(&mut client, &ss, &queue, None); let mut io = TestIo::new(&mut client, &ss, &queue, None);
@ -642,7 +617,7 @@ mod tests {
let mut client = TestBlockChainClient::new(); let mut client = TestBlockChainClient::new();
client.insert_transaction_with_gas_price_to_queue(U256::zero()); client.insert_transaction_with_gas_price_to_queue(U256::zero());
let block_hash = client.block_hash_delta_minus(1); let block_hash = client.block_hash_delta_minus(1);
let mut sync = ChainSync::new(SyncConfig::default(), &client, None); let mut sync = ChainSync::new(SyncConfig::default(), &client);
let queue = RwLock::new(VecDeque::new()); let queue = RwLock::new(VecDeque::new());
let ss = TestSnapshotService::new(); let ss = TestSnapshotService::new();
let mut io = TestIo::new(&mut client, &ss, &queue, None); let mut io = TestIo::new(&mut client, &ss, &queue, None);
@ -680,7 +655,7 @@ mod tests {
let tx1_hash = client.insert_transaction_to_queue(); let tx1_hash = client.insert_transaction_to_queue();
let tx2_hash = client.insert_transaction_with_gas_price_to_queue(U256::zero()); let tx2_hash = client.insert_transaction_with_gas_price_to_queue(U256::zero());
let block_hash = client.block_hash_delta_minus(1); let block_hash = client.block_hash_delta_minus(1);
let mut sync = ChainSync::new(SyncConfig::default(), &client, None); let mut sync = ChainSync::new(SyncConfig::default(), &client);
let queue = RwLock::new(VecDeque::new()); let queue = RwLock::new(VecDeque::new());
let ss = TestSnapshotService::new(); let ss = TestSnapshotService::new();
let mut io = TestIo::new(&mut client, &ss, &queue, None); let mut io = TestIo::new(&mut client, &ss, &queue, None);

6
ethcore/sync/src/chain/sync_packet.rs
View File

@ -55,8 +55,6 @@ pub enum SyncPacket {
GetSnapshotDataPacket = 0x13, GetSnapshotDataPacket = 0x13,
SnapshotDataPacket = 0x14, SnapshotDataPacket = 0x14,
ConsensusDataPacket = 0x15, ConsensusDataPacket = 0x15,
PrivateTransactionPacket = 0x16,
SignedPrivateTransactionPacket = 0x17,
} }
} }
@ -91,9 +89,7 @@ impl PacketInfo for SyncPacket {
| SnapshotManifestPacket | SnapshotManifestPacket
| GetSnapshotDataPacket | GetSnapshotDataPacket
| SnapshotDataPacket | SnapshotDataPacket
| ConsensusDataPacket | ConsensusDataPacket => PAR_PROTOCOL,
| PrivateTransactionPacket
| SignedPrivateTransactionPacket => PAR_PROTOCOL,
} }
} }

4
ethcore/sync/src/lib.rs
View File

@ -40,8 +40,6 @@ extern crate triehash_ethereum;
#[cfg(test)] #[cfg(test)]
extern crate env_logger; extern crate env_logger;
#[cfg(test)] #[cfg(test)]
extern crate ethcore_private_tx;
#[cfg(test)]
extern crate kvdb_memorydb; extern crate kvdb_memorydb;
#[cfg(test)] #[cfg(test)]
extern crate rustc_hex; extern crate rustc_hex;
@ -60,7 +58,6 @@ extern crate trace_time;
mod block_sync; mod block_sync;
mod blocks; mod blocks;
mod chain; mod chain;
mod private_tx;
mod snapshot; mod snapshot;
mod sync_io; mod sync_io;
mod transactions_stats; mod transactions_stats;
@ -74,4 +71,3 @@ pub use api::*;
pub use chain::{SyncState, SyncStatus}; pub use chain::{SyncState, SyncStatus};
pub use devp2p::validate_node_url; pub use devp2p::validate_node_url;
pub use network::{ConnectionDirection, ConnectionFilter, Error, ErrorKind, NonReservedPeerMode}; pub use network::{ConnectionDirection, ConnectionFilter, Error, ErrorKind, NonReservedPeerMode};
pub use private_tx::{NoopPrivateTxHandler, PrivateTxHandler, SimplePrivateTxHandler};

63
ethcore/sync/src/private_tx.rs
View File

@ -1,63 +0,0 @@
// 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;
use parking_lot::Mutex;
/// Trait which should be implemented by a private transaction handler.
pub trait PrivateTxHandler: Send + Sync + 'static {
/// Function called on new private transaction received.
/// Returns the hash of the imported transaction
fn import_private_transaction(&self, rlp: &[u8]) -> Result<H256, String>;
/// Function called on new signed private transaction received.
/// Returns the hash of the imported transaction
fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<H256, String>;
}
/// Nonoperative private transaction handler.
pub struct NoopPrivateTxHandler;
impl PrivateTxHandler for NoopPrivateTxHandler {
fn import_private_transaction(&self, _rlp: &[u8]) -> Result<H256, String> {
Ok(H256::default())
}
fn import_signed_private_transaction(&self, _rlp: &[u8]) -> Result<H256, String> {
Ok(H256::default())
}
}
/// Simple private transaction handler. Used for tests.
#[derive(Default)]
pub struct SimplePrivateTxHandler {
/// imported private transactions
pub txs: Mutex<Vec<Vec<u8>>>,
/// imported signed private transactions
pub signed_txs: Mutex<Vec<Vec<u8>>>,
}
impl PrivateTxHandler for SimplePrivateTxHandler {
fn import_private_transaction(&self, rlp: &[u8]) -> Result<H256, String> {
self.txs.lock().push(rlp.to_vec());
Ok(H256::default())
}
fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<H256, String> {
self.signed_txs.lock().push(rlp.to_vec());
Ok(H256::default())
}
}

44
ethcore/sync/src/tests/helpers.rs
View File

@ -17,11 +17,8 @@
use api::PAR_PROTOCOL; use api::PAR_PROTOCOL;
use bytes::Bytes; use bytes::Bytes;
use chain::{ use chain::{
sync_packet::{ sync_packet::{PacketInfo, SyncPacket},
PacketInfo, SyncPacket, ChainSync, SyncSupplier, ETH_PROTOCOL_VERSION_63, PAR_PROTOCOL_VERSION_2,
SyncPacket::{PrivateTransactionPacket, SignedPrivateTransactionPacket},
},
ChainSync, SyncSupplier, ETH_PROTOCOL_VERSION_63, PAR_PROTOCOL_VERSION_3,
}; };
use ethcore::{ use ethcore::{
client::{ client::{
@ -36,7 +33,7 @@ use ethcore::{
use ethereum_types::H256; use ethereum_types::H256;
use io::{IoChannel, IoContext, IoHandler}; use io::{IoChannel, IoContext, IoHandler};
use network::{self, client_version::ClientVersion, PacketId, PeerId, ProtocolId, SessionInfo}; use network::{self, client_version::ClientVersion, PacketId, PeerId, ProtocolId, SessionInfo};
use parking_lot::{Mutex, RwLock}; use parking_lot::RwLock;
use std::{ use std::{
collections::{HashMap, HashSet, VecDeque}, collections::{HashMap, HashSet, VecDeque},
sync::Arc, sync::Arc,
@ -44,7 +41,6 @@ use std::{
use sync_io::SyncIo; use sync_io::SyncIo;
use tests::snapshot::*; use tests::snapshot::*;
use private_tx::SimplePrivateTxHandler;
use types::BlockNumber; use types::BlockNumber;
use SyncConfig; use SyncConfig;
@ -177,7 +173,7 @@ where
fn protocol_version(&self, protocol: &ProtocolId, peer_id: PeerId) -> u8 { fn protocol_version(&self, protocol: &ProtocolId, peer_id: PeerId) -> u8 {
if protocol == &PAR_PROTOCOL { if protocol == &PAR_PROTOCOL {
PAR_PROTOCOL_VERSION_3.0 PAR_PROTOCOL_VERSION_2.0
} else { } else {
self.eth_protocol_version(peer_id) self.eth_protocol_version(peer_id)
} }
@ -262,7 +258,6 @@ where
pub snapshot_service: Arc<TestSnapshotService>, pub snapshot_service: Arc<TestSnapshotService>,
pub sync: RwLock<ChainSync>, pub sync: RwLock<ChainSync>,
pub queue: RwLock<VecDeque<TestPacket>>, pub queue: RwLock<VecDeque<TestPacket>>,
pub private_tx_handler: Arc<SimplePrivateTxHandler>,
pub io_queue: RwLock<VecDeque<ChainMessageType>>, pub io_queue: RwLock<VecDeque<ChainMessageType>>,
new_blocks_queue: RwLock<VecDeque<NewBlockMessage>>, new_blocks_queue: RwLock<VecDeque<NewBlockMessage>>,
} }
@ -285,22 +280,6 @@ where
ChainMessageType::Consensus(data) => { ChainMessageType::Consensus(data) => {
self.sync.write().propagate_consensus_packet(&mut io, data) self.sync.write().propagate_consensus_packet(&mut io, data)
} }
ChainMessageType::PrivateTransaction(transaction_hash, data) => {
self.sync.write().propagate_private_transaction(
&mut io,
transaction_hash,
PrivateTransactionPacket,
data,
)
}
ChainMessageType::SignedPrivateTransaction(transaction_hash, data) => {
self.sync.write().propagate_private_transaction(
&mut io,
transaction_hash,
SignedPrivateTransactionPacket,
data,
)
}
} }
} }
@ -426,15 +405,13 @@ impl TestNet<EthPeer<TestBlockChainClient>> {
for _ in 0..n { for _ in 0..n {
let chain = TestBlockChainClient::new(); let chain = TestBlockChainClient::new();
let ss = Arc::new(TestSnapshotService::new()); let ss = Arc::new(TestSnapshotService::new());
let private_tx_handler = Arc::new(SimplePrivateTxHandler::default()); let sync = ChainSync::new(config.clone(), &chain);
let sync = ChainSync::new(config.clone(), &chain, Some(private_tx_handler.clone()));
net.peers.push(Arc::new(EthPeer { net.peers.push(Arc::new(EthPeer {
sync: RwLock::new(sync), sync: RwLock::new(sync),
snapshot_service: ss, snapshot_service: ss,
chain: Arc::new(chain), chain: Arc::new(chain),
miner: Arc::new(Miner::new_for_tests(&Spec::new_test(), None)), miner: Arc::new(Miner::new_for_tests(&Spec::new_test(), None)),
queue: RwLock::new(VecDeque::new()), queue: RwLock::new(VecDeque::new()),
private_tx_handler,
io_queue: RwLock::new(VecDeque::new()), io_queue: RwLock::new(VecDeque::new()),
new_blocks_queue: RwLock::new(VecDeque::new()), new_blocks_queue: RwLock::new(VecDeque::new()),
})); }));
@ -476,16 +453,14 @@ impl TestNet<EthPeer<EthcoreClient>> {
) )
.unwrap(); .unwrap();
let private_tx_handler = Arc::new(SimplePrivateTxHandler::default());
let ss = Arc::new(TestSnapshotService::new()); let ss = Arc::new(TestSnapshotService::new());
let sync = ChainSync::new(config, &*client, Some(private_tx_handler.clone())); let sync = ChainSync::new(config, &*client);
let peer = Arc::new(EthPeer { let peer = Arc::new(EthPeer {
sync: RwLock::new(sync), sync: RwLock::new(sync),
snapshot_service: ss, snapshot_service: ss,
chain: client, chain: client,
miner, miner,
queue: RwLock::new(VecDeque::new()), queue: RwLock::new(VecDeque::new()),
private_tx_handler,
io_queue: RwLock::new(VecDeque::new()), io_queue: RwLock::new(VecDeque::new()),
new_blocks_queue: RwLock::new(VecDeque::new()), new_blocks_queue: RwLock::new(VecDeque::new()),
}); });
@ -604,15 +579,11 @@ impl<C: FlushingBlockChainClient> TestNet<EthPeer<C>> {
pub struct TestIoHandler { pub struct TestIoHandler {
pub client: Arc<EthcoreClient>, pub client: Arc<EthcoreClient>,
pub private_tx_queued: Mutex<usize>,
} }
impl TestIoHandler { impl TestIoHandler {
pub fn new(client: Arc<EthcoreClient>) -> Self { pub fn new(client: Arc<EthcoreClient>) -> Self {
TestIoHandler { TestIoHandler { client }
client,
private_tx_queued: Mutex::default(),
}
} }
} }
@ -620,7 +591,6 @@ impl IoHandler<ClientIoMessage> for TestIoHandler {
fn message(&self, _io: &IoContext<ClientIoMessage>, net_message: &ClientIoMessage) { fn message(&self, _io: &IoContext<ClientIoMessage>, net_message: &ClientIoMessage) {
match *net_message { match *net_message {
ClientIoMessage::Execute(ref exec) => { ClientIoMessage::Execute(ref exec) => {
*self.private_tx_queued.lock() += 1;
(*exec.0)(&self.client); (*exec.0)(&self.client);
} }
_ => {} // ignore other messages _ => {} // ignore other messages

1
ethcore/sync/src/tests/mod.rs
View File

@ -17,7 +17,6 @@
mod chain; mod chain;
mod consensus; mod consensus;
pub mod helpers; pub mod helpers;
mod private;
pub mod snapshot; pub mod snapshot;
#[cfg(feature = "ipc")] #[cfg(feature = "ipc")]

200
ethcore/sync/src/tests/private.rs
View File

@ -1,200 +0,0 @@
// 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 ethcore::{
client::{BlockChainClient, ClientIoMessage},
engines,
executive::contract_address,
miner::{self, MinerService},
spec::Spec,
test_helpers::push_block_with_transactions,
CreateContractAddress,
};
use ethcore_private_tx::{
Importer, NoopEncryptor, Provider, ProviderConfig, SignedPrivateTransaction, StoringKeyProvider,
};
use ethkey::KeyPair;
use hash::keccak;
use io::{IoChannel, IoHandler};
use rlp::Rlp;
use rustc_hex::FromHex;
use std::sync::Arc;
use tests::helpers::{TestIoHandler, TestNet};
use types::{
ids::BlockId,
transaction::{Action, Transaction},
};
use SyncConfig;
fn seal_spec() -> Spec {
let spec_data = include_str!("../res/private_spec.json");
Spec::load(&::std::env::temp_dir(), spec_data.as_bytes()).unwrap()
}
#[test]
fn send_private_transaction() {
// Setup two clients
let s0 = KeyPair::from_secret_slice(&keccak("1")).unwrap();
let s1 = KeyPair::from_secret_slice(&keccak("0")).unwrap();
let signer = Arc::new(ethcore_private_tx::KeyPairSigner(vec![
s0.clone(),
s1.clone(),
]));
let mut net = TestNet::with_spec(2, SyncConfig::default(), seal_spec);
let client0 = net.peer(0).chain.clone();
let client1 = net.peer(1).chain.clone();
let io_handler0: Arc<dyn IoHandler<ClientIoMessage>> =
Arc::new(TestIoHandler::new(net.peer(0).chain.clone()));
let io_handler1: Arc<dyn IoHandler<ClientIoMessage>> =
Arc::new(TestIoHandler::new(net.peer(1).chain.clone()));
net.peer(0)
.miner
.set_author(miner::Author::Sealer(engines::signer::from_keypair(
s0.clone(),
)));
net.peer(1)
.miner
.set_author(miner::Author::Sealer(engines::signer::from_keypair(
s1.clone(),
)));
net.peer(0)
.chain
.engine()
.register_client(Arc::downgrade(&net.peer(0).chain) as _);
net.peer(1)
.chain
.engine()
.register_client(Arc::downgrade(&net.peer(1).chain) as _);
net.peer(0)
.chain
.set_io_channel(IoChannel::to_handler(Arc::downgrade(&io_handler0)));
net.peer(1)
.chain
.set_io_channel(IoChannel::to_handler(Arc::downgrade(&io_handler1)));
let (address, _) = contract_address(
CreateContractAddress::FromSenderAndNonce,
&s0.address(),
&0.into(),
&[],
);
let chain_id = client0.signing_chain_id();
// Exhange statuses
net.sync();
// Setup private providers
let validator_config = ProviderConfig {
validator_accounts: vec![s1.address()],
signer_account: None,
};
let signer_config = ProviderConfig {
validator_accounts: Vec::new(),
signer_account: Some(s0.address()),
};
let private_keys = Arc::new(StoringKeyProvider::default());
let pm0 = Arc::new(Provider::new(
client0.clone(),
net.peer(0).miner.clone(),
signer.clone(),
Box::new(NoopEncryptor::default()),
signer_config,
IoChannel::to_handler(Arc::downgrade(&io_handler0)),
private_keys.clone(),
));
pm0.add_notify(net.peers[0].clone());
let pm1 = Arc::new(Provider::new(
client1.clone(),
net.peer(1).miner.clone(),
signer.clone(),
Box::new(NoopEncryptor::default()),
validator_config,
IoChannel::to_handler(Arc::downgrade(&io_handler1)),
private_keys.clone(),
));
pm1.add_notify(net.peers[1].clone());
// Create and deploy contract
let private_contract_test = "6060604052341561000f57600080fd5b60d88061001d6000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630c55699c146046578063bc64b76d14607457600080fd5b3415605057600080fd5b60566098565b60405180826000191660001916815260200191505060405180910390f35b3415607e57600080fd5b6096600480803560001916906020019091905050609e565b005b60005481565b8060008160001916905550505600a165627a7a723058206acbdf4b15ca4c2d43e1b1879b830451a34f1e9d02ff1f2f394d8d857e79d2080029".from_hex().unwrap();
let mut private_create_tx = Transaction::default();
private_create_tx.action = Action::Create;
private_create_tx.data = private_contract_test;
private_create_tx.gas = 200000.into();
let private_create_tx_signed = private_create_tx.sign(&s0.secret(), None);
let validators = vec![s1.address()];
let (public_tx, _) = pm0
.public_creation_transaction(
BlockId::Latest,
&private_create_tx_signed,
&validators,
0.into(),
)
.unwrap();
let public_tx = public_tx.sign(&s0.secret(), chain_id);
let public_tx_copy = public_tx.clone();
push_block_with_transactions(&client0, &[public_tx]);
push_block_with_transactions(&client1, &[public_tx_copy]);
net.sync();
//Create private transaction for modifying state
let mut private_tx = Transaction::default();
private_tx.action = Action::Call(address.clone());
private_tx.data = "bc64b76d2a00000000000000000000000000000000000000000000000000000000000000"
.from_hex()
.unwrap(); //setX(42)
private_tx.gas = 120000.into();
private_tx.nonce = 1.into();
let private_tx = private_tx.sign(&s0.secret(), None);
assert!(pm0.create_private_transaction(private_tx).is_ok());
//send private transaction message to validator
net.sync();
let validator_handler = net.peer(1).private_tx_handler.clone();
let received_private_transactions = validator_handler.txs.lock().clone();
assert_eq!(received_private_transactions.len(), 1);
//process received private transaction message
let private_transaction = received_private_transactions[0].clone();
assert!(pm1.import_private_transaction(&private_transaction).is_ok());
//send signed response
net.sync();
let sender_handler = net.peer(0).private_tx_handler.clone();
let received_signed_private_transactions = sender_handler.signed_txs.lock().clone();
assert_eq!(received_signed_private_transactions.len(), 1);
//process signed response
let signed_private_transaction = received_signed_private_transactions[0].clone();
assert!(pm0
.import_signed_private_transaction(&signed_private_transaction)
.is_ok());
let signature: SignedPrivateTransaction =
Rlp::new(&signed_private_transaction).as_val().unwrap();
assert!(pm0.process_signature(&signature).is_ok());
let local_transactions = net.peer(0).miner.local_transactions();
assert_eq!(local_transactions.len(), 1);
}

66
parity/account_utils.rs
View File

@ -60,13 +60,6 @@ mod accounts {
Ok(None) Ok(None)
} }
pub fn private_tx_signer(
_account_provider: Arc<AccountProvider>,
_passwords: &[Password],
) -> Result<Arc<dyn ethcore_private_tx::Signer>, String> {
Ok(Arc::new(::ethcore_private_tx::DummySigner))
}
pub fn accounts_list( pub fn accounts_list(
_account_provider: Arc<AccountProvider>, _account_provider: Arc<AccountProvider>,
) -> Arc<dyn Fn() -> Vec<Address> + Send + Sync> { ) -> Arc<dyn Fn() -> Vec<Address> + Send + Sync> {
@ -218,62 +211,6 @@ mod accounts {
Ok(author) Ok(author)
} }
mod private_tx {
use super::*;
use ethcore_private_tx::Error;
use ethkey::{Message, Signature};
pub struct AccountSigner {
pub accounts: Arc<AccountProvider>,
pub passwords: Vec<Password>,
}
impl ::ethcore_private_tx::Signer for AccountSigner {
fn decrypt(
&self,
account: Address,
shared_mac: &[u8],
payload: &[u8],
) -> Result<Vec<u8>, Error> {
let password = self.find_account_password(&account);
Ok(self
.accounts
.decrypt(account, password, shared_mac, payload)
.map_err(|e| e.to_string())?)
}
fn sign(&self, account: Address, hash: Message) -> Result<Signature, Error> {
let password = self.find_account_password(&account);
Ok(self
.accounts
.sign(account, password, hash)
.map_err(|e| e.to_string())?)
}
}
impl AccountSigner {
/// Try to unlock account using stored password, return found password if any
fn find_account_password(&self, account: &Address) -> Option<Password> {
for password in &self.passwords {
if let Ok(true) = self.accounts.test_password(account, password) {
return Some(password.clone());
}
}
None
}
}
}
pub fn private_tx_signer(
accounts: Arc<AccountProvider>,
passwords: &[Password],
) -> Result<Arc<dyn crate::ethcore_private_tx::Signer>, String> {
Ok(Arc::new(self::private_tx::AccountSigner {
accounts,
passwords: passwords.to_vec(),
}))
}
pub fn accounts_list( pub fn accounts_list(
account_provider: Arc<AccountProvider>, account_provider: Arc<AccountProvider>,
) -> Arc<dyn Fn() -> Vec<Address> + Send + Sync> { ) -> Arc<dyn Fn() -> Vec<Address> + Send + Sync> {
@ -318,6 +255,5 @@ mod accounts {
} }
pub use self::accounts::{ pub use self::accounts::{
accounts_list, miner_author, miner_local_accounts, prepare_account_provider, private_tx_signer, accounts_list, miner_author, miner_local_accounts, prepare_account_provider, AccountProvider,
AccountProvider,
}; };

9
parity/blockchain.rs
View File

@ -29,7 +29,6 @@ use ethcore::{
miner::Miner, miner::Miner,
verification::queue::VerifierSettings, verification::queue::VerifierSettings,
}; };
use ethcore_private_tx;
use ethcore_service::ClientService; use ethcore_service::ClientService;
use ethereum_types::{Address, H256, U256}; use ethereum_types::{Address, H256, U256};
use hash::{keccak, KECCAK_NULL_RLP}; use hash::{keccak, KECCAK_NULL_RLP};
@ -211,10 +210,6 @@ fn execute_import(cmd: ImportBlockchain) -> Result<(), String> {
// TODO [ToDr] don't use test miner here // TODO [ToDr] don't use test miner here
// (actually don't require miner at all) // (actually don't require miner at all)
Arc::new(Miner::new_for_tests(&spec, None)), Arc::new(Miner::new_for_tests(&spec, None)),
Arc::new(ethcore_private_tx::DummySigner),
Box::new(ethcore_private_tx::NoopEncryptor),
Default::default(),
Default::default(),
) )
.map_err(|e| format!("Client service error: {:?}", e))?; .map_err(|e| format!("Client service error: {:?}", e))?;
@ -350,10 +345,6 @@ fn start_client(
// It's fine to use test version here, // It's fine to use test version here,
// since we don't care about miner parameters at all // since we don't care about miner parameters at all
Arc::new(Miner::new_for_tests(&spec, None)), Arc::new(Miner::new_for_tests(&spec, None)),
Arc::new(ethcore_private_tx::DummySigner),
Box::new(ethcore_private_tx::NoopEncryptor),
Default::default(),
Default::default(),
) )
.map_err(|e| format!("Client service error: {:?}", e))?; .map_err(|e| format!("Client service error: {:?}", e))?;

58
parity/cli/mod.rs
View File

@ -300,35 +300,6 @@ usage! {
"--password=[FILE]...", "--password=[FILE]...",
"Provide a file containing a password for unlocking an account. Leading and trailing whitespace is trimmed.", "Provide a file containing a password for unlocking an account. Leading and trailing whitespace is trimmed.",
["Private Transactions Options"]
FLAG flag_private_enabled: (bool) = false, or |c: &Config| c.private_tx.as_ref()?.enabled,
"--private-tx-enabled",
"Enable private transactions.",
ARG arg_private_signer: (Option<String>) = None, or |c: &Config| c.private_tx.as_ref()?.signer.clone(),
"--private-signer=[ACCOUNT]",
"Specify the account for signing public transaction created upon verified private transaction.",
ARG arg_private_validators: (Option<String>) = None, or |c: &Config| c.private_tx.as_ref()?.validators.as_ref().map(|vec| vec.join(",")),
"--private-validators=[ACCOUNTS]",
"Specify the accounts for validating private transactions. ACCOUNTS is a comma-delimited list of addresses.",
ARG arg_private_account: (Option<String>) = None, or |c: &Config| c.private_tx.as_ref()?.account.clone(),
"--private-account=[ACCOUNT]",
"Specify the account for signing requests to secret store.",
ARG arg_private_sstore_url: (Option<String>) = None, or |c: &Config| c.private_tx.as_ref()?.sstore_url.clone(),
"--private-sstore-url=[URL]",
"Specify secret store URL used for encrypting private transactions.",
ARG arg_private_sstore_threshold: (Option<u32>) = None, or |c: &Config| c.private_tx.as_ref()?.sstore_threshold.clone(),
"--private-sstore-threshold=[NUM]",
"Specify secret store threshold used for encrypting private transactions.",
ARG arg_private_passwords: (Option<String>) = None, or |c: &Config| c.private_tx.as_ref()?.passwords.clone(),
"--private-passwords=[FILE]...",
"Provide a file containing passwords for unlocking accounts (signer, private account, validators).",
["UI Options"] ["UI Options"]
ARG arg_ui_path: (String) = "$BASE/signer", or |c: &Config| c.ui.as_ref()?.path.clone(), ARG arg_ui_path: (String) = "$BASE/signer", or |c: &Config| c.ui.as_ref()?.path.clone(),
"--ui-path=[PATH]", "--ui-path=[PATH]",
@ -438,7 +409,7 @@ usage! {
"--jsonrpc-interface=[IP]", "--jsonrpc-interface=[IP]",
"Specify the hostname portion of the HTTP JSON-RPC API server, IP should be an interface's IP address, or all (all interfaces) or local.", "Specify the hostname portion of the HTTP JSON-RPC API server, IP should be an interface's IP address, or all (all interfaces) or local.",
ARG arg_jsonrpc_apis: (String) = "web3,eth,pubsub,net,parity,private,parity_pubsub,traces", or |c: &Config| c.rpc.as_ref()?.apis.as_ref().map(|vec| vec.join(",")), ARG arg_jsonrpc_apis: (String) = "web3,eth,pubsub,net,parity,parity_pubsub,traces", or |c: &Config| c.rpc.as_ref()?.apis.as_ref().map(|vec| vec.join(",")),
"--jsonrpc-apis=[APIS]", "--jsonrpc-apis=[APIS]",
"Specify the APIs available through the HTTP JSON-RPC interface using a comma-delimited list of API names. Possible names are: all, safe, debug, web3, net, eth, pubsub, personal, signer, parity, parity_pubsub, parity_accounts, parity_set, traces, secretstore. You can also disable a specific API by putting '-' in the front, example: all,-personal. 'safe' enables the following APIs: web3, net, eth, pubsub, parity, parity_pubsub, traces", "Specify the APIs available through the HTTP JSON-RPC interface using a comma-delimited list of API names. Possible names are: all, safe, debug, web3, net, eth, pubsub, personal, signer, parity, parity_pubsub, parity_accounts, parity_set, traces, secretstore. You can also disable a specific API by putting '-' in the front, example: all,-personal. 'safe' enables the following APIs: web3, net, eth, pubsub, parity, parity_pubsub, traces",
@ -479,7 +450,7 @@ usage! {
"--ws-interface=[IP]", "--ws-interface=[IP]",
"Specify the hostname portion of the WebSockets JSON-RPC server, IP should be an interface's IP address, or all (all interfaces) or local.", "Specify the hostname portion of the WebSockets JSON-RPC server, IP should be an interface's IP address, or all (all interfaces) or local.",
ARG arg_ws_apis: (String) = "web3,eth,pubsub,net,parity,parity_pubsub,private,traces", or |c: &Config| c.websockets.as_ref()?.apis.as_ref().map(|vec| vec.join(",")), ARG arg_ws_apis: (String) = "web3,eth,pubsub,net,parity,parity_pubsub,traces", or |c: &Config| c.websockets.as_ref()?.apis.as_ref().map(|vec| vec.join(",")),
"--ws-apis=[APIS]", "--ws-apis=[APIS]",
"Specify the JSON-RPC APIs available through the WebSockets interface using a comma-delimited list of API names. Possible names are: all, safe, web3, net, eth, pubsub, personal, signer, parity, parity_pubsub, parity_accounts, parity_set, traces, secretstore. You can also disable a specific API by putting '-' in the front, example: all,-personal. 'safe' enables the following APIs: web3, net, eth, pubsub, parity, parity_pubsub, traces", "Specify the JSON-RPC APIs available through the WebSockets interface using a comma-delimited list of API names. Possible names are: all, safe, web3, net, eth, pubsub, personal, signer, parity, parity_pubsub, parity_accounts, parity_set, traces, secretstore. You can also disable a specific API by putting '-' in the front, example: all,-personal. 'safe' enables the following APIs: web3, net, eth, pubsub, parity, parity_pubsub, traces",
@ -504,7 +475,7 @@ usage! {
"--ipc-path=[PATH]", "--ipc-path=[PATH]",
"Specify custom path for JSON-RPC over IPC service.", "Specify custom path for JSON-RPC over IPC service.",
ARG arg_ipc_apis: (String) = "web3,eth,pubsub,net,parity,parity_pubsub,parity_accounts,private,traces", or |c: &Config| c.ipc.as_ref()?.apis.as_ref().map(|vec| vec.join(",")), ARG arg_ipc_apis: (String) = "web3,eth,pubsub,net,parity,parity_pubsub,parity_accounts,traces", or |c: &Config| c.ipc.as_ref()?.apis.as_ref().map(|vec| vec.join(",")),
"--ipc-apis=[APIS]", "--ipc-apis=[APIS]",
"Specify custom API set available via JSON-RPC over IPC using a comma-delimited list of API names. Possible names are: all, safe, web3, net, eth, pubsub, personal, signer, parity, parity_pubsub, parity_accounts, parity_set, traces, secretstore. You can also disable a specific API by putting '-' in the front, example: all,-personal. 'safe' enables the following APIs: web3, net, eth, pubsub, parity, parity_pubsub, traces", "Specify custom API set available via JSON-RPC over IPC using a comma-delimited list of API names. Possible names are: all, safe, web3, net, eth, pubsub, personal, signer, parity, parity_pubsub, parity_accounts, parity_set, traces, secretstore. You can also disable a specific API by putting '-' in the front, example: all,-personal. 'safe' enables the following APIs: web3, net, eth, pubsub, parity, parity_pubsub, traces",
@ -832,7 +803,6 @@ struct Config {
websockets: Option<Ws>, websockets: Option<Ws>,
ipc: Option<Ipc>, ipc: Option<Ipc>,
secretstore: Option<SecretStore>, secretstore: Option<SecretStore>,
private_tx: Option<PrivateTransactions>,
mining: Option<Mining>, mining: Option<Mining>,
footprint: Option<Footprint>, footprint: Option<Footprint>,
snapshots: Option<Snapshots>, snapshots: Option<Snapshots>,
@ -864,18 +834,6 @@ struct Account {
fast_unlock: Option<bool>, fast_unlock: Option<bool>,
} }
#[derive(Default, Debug, PartialEq, Deserialize)]
#[serde(deny_unknown_fields)]
struct PrivateTransactions {
enabled: Option<bool>,
signer: Option<String>,
validators: Option<Vec<String>>,
account: Option<String>,
passwords: Option<String>,
sstore_url: Option<String>,
sstore_threshold: Option<u32>,
}
#[derive(Default, Debug, PartialEq, Deserialize)] #[derive(Default, Debug, PartialEq, Deserialize)]
#[serde(deny_unknown_fields)] #[serde(deny_unknown_fields)]
struct Ui { struct Ui {
@ -1297,15 +1255,6 @@ mod tests {
arg_accounts_refresh: 5u64, arg_accounts_refresh: 5u64,
flag_fast_unlock: false, flag_fast_unlock: false,
// -- Private Transactions Options
flag_private_enabled: true,
arg_private_signer: Some("0xdeadbeefcafe0000000000000000000000000000".into()),
arg_private_validators: Some("0xdeadbeefcafe0000000000000000000000000000".into()),
arg_private_passwords: Some("~/.safe/password.file".into()),
arg_private_account: Some("0xdeadbeefcafe0000000000000000000000000000".into()),
arg_private_sstore_url: Some("http://localhost:8082".into()),
arg_private_sstore_threshold: Some(0),
arg_ui_path: "$HOME/.parity/signer".into(), arg_ui_path: "$HOME/.parity/signer".into(),
// -- Networking Options // -- Networking Options
@ -1576,7 +1525,6 @@ mod tests {
http_port: Some(8082), http_port: Some(8082),
path: None, path: None,
}), }),
private_tx: None,
mining: Some(Mining { mining: Some(Mining {
author: Some("0xdeadbeefcafe0000000000000000000000000001".into()), author: Some("0xdeadbeefcafe0000000000000000000000000001".into()),
engine_signer: Some("0xdeadbeefcafe0000000000000000000000000001".into()), engine_signer: Some("0xdeadbeefcafe0000000000000000000000000001".into()),

9
parity/cli/tests/config.full.toml
View File

@ -15,15 +15,6 @@ unlock = ["0xdeadbeefcafe0000000000000000000000000000"]
password = ["~/.safe/password.file"] password = ["~/.safe/password.file"]
keys_iterations = 10240 keys_iterations = 10240
[private_tx]
enabled = true
signer = "0xdeadbeefcafe0000000000000000000000000000"
validators = ["0xdeadbeefcafe0000000000000000000000000000"]
passwords = "~/.safe/password.file"
account = "0xdeadbeefcafe0000000000000000000000000000"
sstore_url = "http://localhost:8082"
sstore_threshold = 0
[ui] [ui]
path = "$HOME/.parity/signer" path = "$HOME/.parity/signer"

36
parity/configuration.rs
View File

@ -52,7 +52,6 @@ use dir::{
Directories, Directories,
}; };
use ethcore_logger::Config as LogConfig; use ethcore_logger::Config as LogConfig;
use ethcore_private_tx::{EncryptorConfig, ProviderConfig};
use helpers::{ use helpers::{
parity_ipc_path, to_address, to_addresses, to_block_id, to_bootnodes, to_duration, to_mode, parity_ipc_path, to_address, to_addresses, to_block_id, to_bootnodes, to_duration, to_mode,
to_pending_set, to_price, to_queue_penalization, to_queue_strategy, to_u256, to_pending_set, to_price, to_queue_penalization, to_queue_strategy, to_u256,
@ -382,8 +381,6 @@ impl Configuration {
}; };
let verifier_settings = self.verifier_settings(); let verifier_settings = self.verifier_settings();
let (private_provider_conf, private_enc_conf, private_tx_enabled) =
self.private_provider_config()?;
let run_cmd = RunCmd { let run_cmd = RunCmd {
cache_config: cache_config, cache_config: cache_config,
@ -418,9 +415,6 @@ impl Configuration {
experimental_rpcs, experimental_rpcs,
net_settings: self.network_settings()?, net_settings: self.network_settings()?,
secretstore_conf: secretstore_conf, secretstore_conf: secretstore_conf,
private_provider_conf: private_provider_conf,
private_encryptor_conf: private_enc_conf,
private_tx_enabled,
name: self.args.arg_identity, name: self.args.arg_identity,
custom_bootnodes: self.args.arg_bootnodes.is_some(), custom_bootnodes: self.args.arg_bootnodes.is_some(),
check_seal: !self.args.flag_no_seal_check, check_seal: !self.args.flag_no_seal_check,
@ -959,33 +953,6 @@ impl Configuration {
Ok(conf) Ok(conf)
} }
fn private_provider_config(&self) -> Result<(ProviderConfig, EncryptorConfig, bool), String> {
let provider_conf = ProviderConfig {
validator_accounts: to_addresses(&self.args.arg_private_validators)?,
signer_account: self
.args
.arg_private_signer
.clone()
.and_then(|account| to_address(Some(account)).ok()),
};
let encryptor_conf = EncryptorConfig {
base_url: self.args.arg_private_sstore_url.clone(),
threshold: self.args.arg_private_sstore_threshold.unwrap_or(0),
key_server_account: self
.args
.arg_private_account
.clone()
.and_then(|account| to_address(Some(account)).ok()),
};
Ok((
provider_conf,
encryptor_conf,
self.args.flag_private_enabled,
))
}
fn snapshot_config(&self) -> Result<SnapshotConfiguration, String> { fn snapshot_config(&self) -> Result<SnapshotConfiguration, String> {
let conf = SnapshotConfiguration { let conf = SnapshotConfiguration {
no_periodic: self.args.flag_no_periodic_snapshot, no_periodic: self.args.flag_no_periodic_snapshot,
@ -1554,9 +1521,6 @@ mod tests {
experimental_rpcs: false, experimental_rpcs: false,
net_settings: Default::default(), net_settings: Default::default(),
secretstore_conf: Default::default(), secretstore_conf: Default::default(),
private_provider_conf: Default::default(),
private_encryptor_conf: Default::default(),
private_tx_enabled: false,
name: "".into(), name: "".into(),
custom_bootnodes: false, custom_bootnodes: false,
fat_db: Default::default(), fat_db: Default::default(),

1
parity/lib.rs
View File

@ -49,7 +49,6 @@ extern crate ethcore_io as io;
extern crate ethcore_logger; extern crate ethcore_logger;
extern crate ethcore_miner as miner; extern crate ethcore_miner as miner;
extern crate ethcore_network as network; extern crate ethcore_network as network;
extern crate ethcore_private_tx;
extern crate ethcore_service; extern crate ethcore_service;
extern crate ethcore_sync as sync; extern crate ethcore_sync as sync;
extern crate ethereum_types; extern crate ethereum_types;

4
parity/modules.rs
View File

@ -21,7 +21,7 @@ use sync::{self, ConnectionFilter, NetworkConfiguration, Params, SyncConfig};
pub use ethcore::client::ChainNotify; pub use ethcore::client::ChainNotify;
use ethcore_logger::Config as LogConfig; use ethcore_logger::Config as LogConfig;
pub use sync::{EthSync, ManageNetwork, PrivateTxHandler, SyncProvider}; pub use sync::{EthSync, ManageNetwork, SyncProvider};
pub type SyncModules = ( pub type SyncModules = (
Arc<dyn SyncProvider>, Arc<dyn SyncProvider>,
@ -35,7 +35,6 @@ pub fn sync(
network_config: NetworkConfiguration, network_config: NetworkConfiguration,
chain: Arc<dyn BlockChainClient>, chain: Arc<dyn BlockChainClient>,
snapshot_service: Arc<dyn SnapshotService>, snapshot_service: Arc<dyn SnapshotService>,
private_tx_handler: Option<Arc<dyn PrivateTxHandler>>,
_log_settings: &LogConfig, _log_settings: &LogConfig,
connection_filter: Option<Arc<dyn ConnectionFilter>>, connection_filter: Option<Arc<dyn ConnectionFilter>>,
) -> Result<SyncModules, sync::Error> { ) -> Result<SyncModules, sync::Error> {
@ -44,7 +43,6 @@ pub fn sync(
config, config,
chain, chain,
snapshot_service, snapshot_service,
private_tx_handler,
network_config, network_config,
}, },
connection_filter, connection_filter,

33
parity/rpc_apis.rs
View File

@ -21,7 +21,6 @@ pub use parity_rpc::signer::SignerService;
use account_utils::{self, AccountProvider}; use account_utils::{self, AccountProvider};
use ethcore::{client::Client, miner::Miner, snapshot::SnapshotService}; use ethcore::{client::Client, miner::Miner, snapshot::SnapshotService};
use ethcore_logger::RotatingLogger; use ethcore_logger::RotatingLogger;
use ethcore_service::PrivateTxService;
use fetch::Client as FetchClient; use fetch::Client as FetchClient;
use jsonrpc_core::{self as core, MetaIoHandler}; use jsonrpc_core::{self as core, MetaIoHandler};
use miner::external::ExternalMiner; use miner::external::ExternalMiner;
@ -52,8 +51,6 @@ pub enum Api {
Parity, Parity,
/// Traces (Safe) /// Traces (Safe)
Traces, Traces,
/// Private transaction manager (Safe)
Private,
/// Parity PubSub - Generic Publish-Subscriber (Safety depends on other APIs exposed). /// Parity PubSub - Generic Publish-Subscriber (Safety depends on other APIs exposed).
ParityPubSub, ParityPubSub,
/// Parity Accounts extensions (UNSAFE: Passwords, Side Effects (new account)) /// Parity Accounts extensions (UNSAFE: Passwords, Side Effects (new account))
@ -82,7 +79,6 @@ impl FromStr for Api {
"parity_pubsub" => Ok(ParityPubSub), "parity_pubsub" => Ok(ParityPubSub),
"parity_set" => Ok(ParitySet), "parity_set" => Ok(ParitySet),
"personal" => Ok(Personal), "personal" => Ok(Personal),
"private" => Ok(Private),
"pubsub" => Ok(EthPubSub), "pubsub" => Ok(EthPubSub),
"secretstore" => Ok(SecretStore), "secretstore" => Ok(SecretStore),
"signer" => Ok(Signer), "signer" => Ok(Signer),
@ -191,7 +187,6 @@ pub struct FullDependencies {
pub sync: Arc<dyn SyncProvider>, pub sync: Arc<dyn SyncProvider>,
pub net: Arc<dyn ManageNetwork>, pub net: Arc<dyn ManageNetwork>,
pub accounts: Arc<AccountProvider>, pub accounts: Arc<AccountProvider>,
pub private_tx_service: Option<Arc<PrivateTxService>>,
pub miner: Arc<Miner>, pub miner: Arc<Miner>,
pub external_miner: Arc<ExternalMiner>, pub external_miner: Arc<ExternalMiner>,
pub logger: Arc<RotatingLogger>, pub logger: Arc<RotatingLogger>,
@ -385,12 +380,6 @@ impl FullDependencies {
#[cfg(feature = "accounts")] #[cfg(feature = "accounts")]
handler.extend_with(SecretStoreClient::new(&self.accounts).to_delegate()); handler.extend_with(SecretStoreClient::new(&self.accounts).to_delegate());
} }
Api::Private => {
handler.extend_with(
PrivateClient::new(self.private_tx_service.as_ref().map(|p| p.provider()))
.to_delegate(),
);
}
} }
} }
} }
@ -420,17 +409,11 @@ impl ApiSet {
} }
pub fn list_apis(&self) -> HashSet<Api> { pub fn list_apis(&self) -> HashSet<Api> {
let mut public_list: HashSet<Api> = [ let mut public_list: HashSet<Api> =
Api::Web3, [Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity]
Api::Net, .iter()
Api::Eth, .cloned()
Api::EthPubSub, .collect();
Api::Parity,
Api::Private,
]
.iter()
.cloned()
.collect();
match *self { match *self {
ApiSet::List(ref apis) => apis.clone(), ApiSet::List(ref apis) => apis.clone(),
@ -488,7 +471,6 @@ mod test {
assert_eq!(Api::ParitySet, "parity_set".parse().unwrap()); assert_eq!(Api::ParitySet, "parity_set".parse().unwrap());
assert_eq!(Api::Traces, "traces".parse().unwrap()); assert_eq!(Api::Traces, "traces".parse().unwrap());
assert_eq!(Api::SecretStore, "secretstore".parse().unwrap()); assert_eq!(Api::SecretStore, "secretstore".parse().unwrap());
assert_eq!(Api::Private, "private".parse().unwrap());
assert!("rp".parse::<Api>().is_err()); assert!("rp".parse::<Api>().is_err());
} }
@ -516,7 +498,6 @@ mod test {
Api::Parity, Api::Parity,
Api::ParityPubSub, Api::ParityPubSub,
Api::Traces, Api::Traces,
Api::Private,
] ]
.into_iter() .into_iter()
.collect(); .collect();
@ -534,7 +515,6 @@ mod test {
Api::Parity, Api::Parity,
Api::ParityPubSub, Api::ParityPubSub,
Api::Traces, Api::Traces,
Api::Private,
// semi-safe // semi-safe
Api::ParityAccounts, Api::ParityAccounts,
] ]
@ -561,7 +541,6 @@ mod test {
Api::ParitySet, Api::ParitySet,
Api::Signer, Api::Signer,
Api::Personal, Api::Personal,
Api::Private,
Api::Debug, Api::Debug,
] ]
.into_iter() .into_iter()
@ -587,7 +566,6 @@ mod test {
Api::ParityAccounts, Api::ParityAccounts,
Api::ParitySet, Api::ParitySet,
Api::Signer, Api::Signer,
Api::Private,
Api::Debug, Api::Debug,
] ]
.into_iter() .into_iter()
@ -609,7 +587,6 @@ mod test {
Api::Parity, Api::Parity,
Api::ParityPubSub, Api::ParityPubSub,
Api::Traces, Api::Traces,
Api::Private,
] ]
.into_iter() .into_iter()
.collect() .collect()

38
parity/run.rs
View File

@ -33,7 +33,6 @@ use ethcore::{
verification::queue::VerifierSettings, verification::queue::VerifierSettings,
}; };
use ethcore_logger::{Config as LogConfig, RotatingLogger}; use ethcore_logger::{Config as LogConfig, RotatingLogger};
use ethcore_private_tx::{EncryptorConfig, ProviderConfig, SecretStoreEncryptor};
use ethcore_service::ClientService; use ethcore_service::ClientService;
use helpers::{execute_upgrades, passwords_from_files, to_client_config}; use helpers::{execute_upgrades, passwords_from_files, to_client_config};
use informant::{FullNodeInformantData, Informant}; use informant::{FullNodeInformantData, Informant};
@ -56,7 +55,7 @@ use rpc;
use rpc_apis; use rpc_apis;
use secretstore; use secretstore;
use signer; use signer;
use sync::{self, PrivateTxHandler, SyncConfig}; use sync::{self, SyncConfig};
use user_defaults::UserDefaults; use user_defaults::UserDefaults;
// how often to take periodic snapshots. // how often to take periodic snapshots.
@ -100,9 +99,6 @@ pub struct RunCmd {
pub experimental_rpcs: bool, pub experimental_rpcs: bool,
pub net_settings: NetworkSettings, pub net_settings: NetworkSettings,
pub secretstore_conf: secretstore::Configuration, pub secretstore_conf: secretstore::Configuration,
pub private_provider_conf: ProviderConfig,
pub private_encryptor_conf: EncryptorConfig,
pub private_tx_enabled: bool,
pub name: String, pub name: String,
pub custom_bootnodes: bool, pub custom_bootnodes: bool,
pub stratum: Option<stratum::Options>, pub stratum: Option<stratum::Options>,
@ -348,8 +344,6 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<RunningClient
.open(&client_path) .open(&client_path)
.map_err(|e| format!("Failed to open database {:?}", e))?; .map_err(|e| format!("Failed to open database {:?}", e))?;
let private_tx_signer = account_utils::private_tx_signer(account_provider.clone(), &passwords)?;
// create client service. // create client service.
let service = ClientService::start( let service = ClientService::start(
client_config, client_config,
@ -359,17 +353,6 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<RunningClient
restoration_db_handler, restoration_db_handler,
&cmd.dirs.ipc_path(), &cmd.dirs.ipc_path(),
miner.clone(), miner.clone(),
private_tx_signer.clone(),
Box::new(
SecretStoreEncryptor::new(
cmd.private_encryptor_conf.clone(),
fetch.clone(),
private_tx_signer,
)
.map_err(|e| e.to_string())?,
),
cmd.private_provider_conf,
cmd.private_encryptor_conf,
) )
.map_err(|e| format!("Client service error: {:?}", e))?; .map_err(|e| format!("Client service error: {:?}", e))?;
@ -382,9 +365,6 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<RunningClient
// Update miners block gas limit // Update miners block gas limit
miner.update_transaction_queue_limits(*client.best_block_header().gas_limit()); miner.update_transaction_queue_limits(*client.best_block_header().gas_limit());
// take handle to private transactions service
let private_tx_service = service.private_tx_service();
let private_tx_provider = private_tx_service.provider();
let connection_filter = connection_filter_address.map(|a| { let connection_filter = connection_filter_address.map(|a| {
Arc::new(NodeFilter::new( Arc::new(NodeFilter::new(
Arc::downgrade(&client) as Weak<dyn BlockChainClient>, Arc::downgrade(&client) as Weak<dyn BlockChainClient>,
@ -446,18 +426,12 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<RunningClient
.map_err(|e| format!("Stratum start error: {:?}", e))?; .map_err(|e| format!("Stratum start error: {:?}", e))?;
} }
let private_tx_sync: Option<Arc<dyn PrivateTxHandler>> = match cmd.private_tx_enabled {
true => Some(private_tx_service.clone() as Arc<dyn PrivateTxHandler>),
false => None,
};
// create sync object // create sync object
let (sync_provider, manage_network, chain_notify, priority_tasks) = modules::sync( let (sync_provider, manage_network, chain_notify, priority_tasks) = modules::sync(
sync_config, sync_config,
net_conf.clone().into(), net_conf.clone().into(),
client.clone(), client.clone(),
snapshot_service.clone(), snapshot_service.clone(),
private_tx_sync,
&cmd.logger_config, &cmd.logger_config,
connection_filter connection_filter
.clone() .clone()
@ -480,15 +454,6 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<RunningClient
} }
})); }));
// provider not added to a notification center is effectively disabled
// TODO [debris] refactor it later on
if cmd.private_tx_enabled {
service.add_notify(private_tx_provider.clone());
// TODO [ToDr] PrivateTX should use separate notifications
// re-using ChainNotify for this is a bit abusive.
private_tx_provider.add_notify(chain_notify.clone());
}
// start network // start network
if network_enabled { if network_enabled {
chain_notify.start(); chain_notify.start();
@ -515,7 +480,6 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<RunningClient
ws_address: cmd.ws_conf.address(), ws_address: cmd.ws_conf.address(),
fetch: fetch.clone(), fetch: fetch.clone(),
executor: runtime.executor(), executor: runtime.executor(),
private_tx_service: Some(private_tx_service.clone()),
gas_price_percentile: cmd.gas_price_percentile, gas_price_percentile: cmd.gas_price_percentile,
poll_lifetime: cmd.poll_lifetime, poll_lifetime: cmd.poll_lifetime,
allow_missing_blocks: cmd.allow_missing_blocks, allow_missing_blocks: cmd.allow_missing_blocks,

5
parity/snapshot.rs
View File

@ -38,7 +38,6 @@ use types::ids::BlockId;
use cache::CacheConfig; use cache::CacheConfig;
use db; use db;
use dir::Directories; use dir::Directories;
use ethcore_private_tx;
use helpers::{execute_upgrades, to_client_config}; use helpers::{execute_upgrades, to_client_config};
use params::{fatdb_switch_to_bool, tracing_switch_to_bool, Pruning, SpecType, Switch}; use params::{fatdb_switch_to_bool, tracing_switch_to_bool, Pruning, SpecType, Switch};
use user_defaults::UserDefaults; use user_defaults::UserDefaults;
@ -239,10 +238,6 @@ impl SnapshotCommand {
// TODO [ToDr] don't use test miner here // TODO [ToDr] don't use test miner here
// (actually don't require miner at all) // (actually don't require miner at all)
Arc::new(Miner::new_for_tests(&spec, None)), Arc::new(Miner::new_for_tests(&spec, None)),
Arc::new(ethcore_private_tx::DummySigner),
Box::new(ethcore_private_tx::NoopEncryptor),
Default::default(),
Default::default(),
) )
.map_err(|e| format!("Client service error: {:?}", e))?; .map_err(|e| format!("Client service error: {:?}", e))?;

1
rpc/Cargo.toml
View File

@ -38,7 +38,6 @@ ethcore-accounts = { path = "../accounts", optional = true }
ethcore-logger = { path = "../parity/logger" } ethcore-logger = { path = "../parity/logger" }
ethcore-miner = { path = "../miner" } ethcore-miner = { path = "../miner" }
ethcore-network = { path = "../util/network" } ethcore-network = { path = "../util/network" }
ethcore-private-tx = { path = "../ethcore/private-tx" }
ethcore-sync = { path = "../ethcore/sync" } ethcore-sync = { path = "../ethcore/sync" }
ethereum-types = "0.4" ethereum-types = "0.4"
parity-bytes = "0.1" parity-bytes = "0.1"

1
rpc/src/lib.rs
View File

@ -64,7 +64,6 @@ extern crate ethcore;
extern crate ethcore_logger; extern crate ethcore_logger;
extern crate ethcore_miner as miner; extern crate ethcore_miner as miner;
extern crate ethcore_network as network; extern crate ethcore_network as network;
extern crate ethcore_private_tx;
extern crate ethcore_sync as sync; extern crate ethcore_sync as sync;
extern crate ethereum_types; extern crate ethereum_types;
extern crate ethkey; extern crate ethkey;

26
rpc/src/v1/helpers/errors.rs
View File

@ -22,7 +22,6 @@ use ethcore::{
client::{BlockChainClient, BlockId}, client::{BlockChainClient, BlockId},
error::{CallError, Error as EthcoreError, ErrorKind}, error::{CallError, Error as EthcoreError, ErrorKind},
}; };
use ethcore_private_tx::Error as PrivateTransactionError;
use jsonrpc_core::{Error, ErrorCode, Result as RpcResult, Value}; use jsonrpc_core::{Error, ErrorCode, Result as RpcResult, Value};
use rlp::DecoderError; use rlp::DecoderError;
use types::{blockchain_info::BlockChainInfo, transaction::Error as TransactionError}; use types::{blockchain_info::BlockChainInfo, transaction::Error as TransactionError};
@ -47,7 +46,6 @@ mod codes {
#[cfg(any(test, feature = "accounts"))] #[cfg(any(test, feature = "accounts"))]
pub const PASSWORD_INVALID: i64 = -32021; pub const PASSWORD_INVALID: i64 = -32021;
pub const ACCOUNT_ERROR: i64 = -32023; pub const ACCOUNT_ERROR: i64 = -32023;
pub const PRIVATE_ERROR: i64 = -32024;
pub const REQUEST_REJECTED: i64 = -32040; pub const REQUEST_REJECTED: i64 = -32040;
pub const REQUEST_REJECTED_LIMIT: i64 = -32041; pub const REQUEST_REJECTED_LIMIT: i64 = -32041;
pub const REQUEST_NOT_FOUND: i64 = -32042; pub const REQUEST_NOT_FOUND: i64 = -32042;
@ -70,14 +68,6 @@ pub fn unimplemented(details: Option<String>) -> Error {
} }
} }
pub fn light_unimplemented(details: Option<String>) -> Error {
Error {
code: ErrorCode::ServerError(codes::UNSUPPORTED_REQUEST),
message: "This request is unsupported for light clients.".into(),
data: details.map(Value::String),
}
}
pub fn unsupported<T: Into<String>>(msg: T, details: Option<T>) -> Error { pub fn unsupported<T: Into<String>>(msg: T, details: Option<T>) -> Error {
Error { Error {
code: ErrorCode::ServerError(codes::UNSUPPORTED_REQUEST), code: ErrorCode::ServerError(codes::UNSUPPORTED_REQUEST),
@ -374,22 +364,6 @@ pub fn password(error: ::accounts::SignError) -> Error {
} }
} }
pub fn private_message(error: PrivateTransactionError) -> Error {
Error {
code: ErrorCode::ServerError(codes::PRIVATE_ERROR),
message: "Private transactions call failed.".into(),
data: Some(Value::String(format!("{:?}", error))),
}
}
pub fn private_message_block_id_not_supported() -> Error {
Error {
code: ErrorCode::ServerError(codes::PRIVATE_ERROR),
message: "Pending block id not supported.".into(),
data: None,
}
}
pub fn transaction_message(error: &TransactionError) -> String { pub fn transaction_message(error: &TransactionError) -> String {
use self::TransactionError::*; use self::TransactionError::*;

2
rpc/src/v1/impls/mod.rs
View File

@ -27,7 +27,6 @@ mod parity_accounts;
mod parity_set; mod parity_set;
#[cfg(any(test, feature = "accounts"))] #[cfg(any(test, feature = "accounts"))]
mod personal; mod personal;
mod private;
mod pubsub; mod pubsub;
#[cfg(any(test, feature = "accounts"))] #[cfg(any(test, feature = "accounts"))]
mod secretstore; mod secretstore;
@ -53,7 +52,6 @@ pub use self::{
net::NetClient, net::NetClient,
parity::ParityClient, parity::ParityClient,
parity_set::ParitySetClient, parity_set::ParitySetClient,
private::PrivateClient,
pubsub::PubSubClient, pubsub::PubSubClient,
signer::SignerClient, signer::SignerClient,
signing::SigningQueueClient, signing::SigningQueueClient,

142
rpc/src/v1/impls/private.rs
View File

@ -1,142 +0,0 @@
// 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/>.
//! Private transaction signing RPC implementation.
use std::sync::Arc;
use rlp::Rlp;
use ethcore_private_tx::Provider as PrivateTransactionManager;
use ethereum_types::{Address, H160, H256, U256};
use types::transaction::SignedTransaction;
use jsonrpc_core::Error;
use v1::{
helpers::{errors, fake_sign},
metadata::Metadata,
traits::Private,
types::{
block_number_to_id, BlockNumber, Bytes, CallRequest, PrivateTransactionReceipt,
PrivateTransactionReceiptAndTransaction, TransactionRequest,
},
};
/// Private transaction manager API endpoint implementation.
pub struct PrivateClient {
private: Option<Arc<PrivateTransactionManager>>,
}
impl PrivateClient {
/// Creates a new instance.
pub fn new(private: Option<Arc<PrivateTransactionManager>>) -> Self {
PrivateClient { private }
}
fn unwrap_manager(&self) -> Result<&PrivateTransactionManager, Error> {
match self.private {
Some(ref arc) => Ok(&**arc),
None => Err(errors::light_unimplemented(None)),
}
}
}
impl Private for PrivateClient {
type Metadata = Metadata;
fn send_transaction(&self, request: Bytes) -> Result<PrivateTransactionReceipt, Error> {
let signed_transaction = Rlp::new(&request.into_vec())
.as_val()
.map_err(errors::rlp)
.and_then(|tx| SignedTransaction::new(tx).map_err(errors::transaction))?;
let client = self.unwrap_manager()?;
let receipt = client
.create_private_transaction(signed_transaction)
.map_err(errors::private_message)?;
Ok(receipt.into())
}
fn compose_deployment_transaction(
&self,
block_number: BlockNumber,
request: Bytes,
validators: Vec<H160>,
gas_price: U256,
) -> Result<PrivateTransactionReceiptAndTransaction, Error> {
let signed_transaction = Rlp::new(&request.into_vec())
.as_val()
.map_err(errors::rlp)
.and_then(|tx| SignedTransaction::new(tx).map_err(errors::transaction))?;
let client = self.unwrap_manager()?;
let addresses: Vec<Address> = validators.into_iter().map(Into::into).collect();
let id = match block_number {
BlockNumber::Pending => return Err(errors::private_message_block_id_not_supported()),
num => block_number_to_id(num),
};
let (transaction, contract_address) = client
.public_creation_transaction(id, &signed_transaction, addresses.as_slice(), gas_price)
.map_err(errors::private_message)?;
let tx_hash = transaction.hash(None);
let request = TransactionRequest {
from: Some(signed_transaction.sender()),
to: None,
nonce: Some(transaction.nonce),
gas_price: Some(transaction.gas_price),
gas: Some(transaction.gas),
value: Some(transaction.value),
data: Some(transaction.data.into()),
condition: None,
};
Ok(PrivateTransactionReceiptAndTransaction {
transaction: request,
receipt: PrivateTransactionReceipt {
transaction_hash: tx_hash,
contract_address,
status_code: 0,
},
})
}
fn private_call(
&self,
block_number: BlockNumber,
request: CallRequest,
) -> Result<Bytes, Error> {
let id = match block_number {
BlockNumber::Pending => return Err(errors::private_message_block_id_not_supported()),
num => block_number_to_id(num),
};
let request = CallRequest::into(request);
let signed = fake_sign::sign_call(request)?;
let client = self.unwrap_manager()?;
let executed_result = client
.private_call(id, &signed)
.map_err(errors::private_message)?;
Ok(executed_result.output.into())
}
fn private_contract_key(&self, contract_address: H160) -> Result<H256, Error> {
let client = self.unwrap_manager()?;
let key = client
.contract_key_id(&contract_address)
.map_err(errors::private_message)?;
Ok(key)
}
}

2
rpc/src/v1/mod.rs
View File

@ -48,7 +48,7 @@ pub use self::{
metadata::Metadata, metadata::Metadata,
traits::{ traits::{
Debug, Eth, EthFilter, EthPubSub, EthSigning, Net, Parity, ParityAccounts, Debug, Eth, EthFilter, EthPubSub, EthSigning, Net, Parity, ParityAccounts,
ParityAccountsInfo, ParitySet, ParitySetAccounts, ParitySigning, Personal, Private, PubSub, ParityAccountsInfo, ParitySet, ParitySetAccounts, ParitySigning, Personal, PubSub,
SecretStore, Signer, Traces, Web3, SecretStore, Signer, Traces, Web3,
}, },
types::Origin, types::Origin,

2
rpc/src/v1/traits/mod.rs
View File

@ -26,7 +26,6 @@ pub mod parity_accounts;
pub mod parity_set; pub mod parity_set;
pub mod parity_signing; pub mod parity_signing;
pub mod personal; pub mod personal;
pub mod private;
pub mod pubsub; pub mod pubsub;
pub mod secretstore; pub mod secretstore;
pub mod signer; pub mod signer;
@ -44,7 +43,6 @@ pub use self::{
parity_set::{ParitySet, ParitySetAccounts}, parity_set::{ParitySet, ParitySetAccounts},
parity_signing::ParitySigning, parity_signing::ParitySigning,
personal::Personal, personal::Personal,
private::Private,
pubsub::PubSub, pubsub::PubSub,
secretstore::SecretStore, secretstore::SecretStore,
signer::Signer, signer::Signer,

55
rpc/src/v1/traits/private.rs
View File

@ -1,55 +0,0 @@
// 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/>.
//! SecretStore-specific rpc interface.
use ethereum_types::{H160, H256, U256};
use jsonrpc_core::Error;
use jsonrpc_derive::rpc;
use v1::types::{
BlockNumber, Bytes, CallRequest, PrivateTransactionReceipt,
PrivateTransactionReceiptAndTransaction,
};
/// Private transaction management RPC interface.
#[rpc(server)]
pub trait Private {
/// RPC Metadata
type Metadata;
/// Sends private transaction; Transaction will be added to the validation queue and sent out when ready.
#[rpc(name = "private_sendTransaction")]
fn send_transaction(&self, _: Bytes) -> Result<PrivateTransactionReceipt, Error>;
/// Creates a transaction for contract's deployment from origin (signed transaction)
#[rpc(name = "private_composeDeploymentTransaction")]
fn compose_deployment_transaction(
&self,
_: BlockNumber,
_: Bytes,
_: Vec<H160>,
_: U256,
) -> Result<PrivateTransactionReceiptAndTransaction, Error>;
/// Make a call to the private contract
#[rpc(name = "private_call")]
fn private_call(&self, _: BlockNumber, _: CallRequest) -> Result<Bytes, Error>;
/// Retrieve the id of the key associated with the contract
#[rpc(name = "private_contractKey")]
fn private_contract_key(&self, _: H160) -> Result<H256, Error>;
}

2
rpc/src/v1/types/mod.rs
View File

@ -32,7 +32,6 @@ mod histogram;
mod index; mod index;
mod log; mod log;
mod node_kind; mod node_kind;
mod private_receipt;
mod provenance; mod provenance;
mod receipt; mod receipt;
mod rpc_settings; mod rpc_settings;
@ -65,7 +64,6 @@ pub use self::{
index::Index, index::Index,
log::Log, log::Log,
node_kind::{Availability, Capability, NodeKind}, node_kind::{Availability, Capability, NodeKind},
private_receipt::{PrivateTransactionReceipt, PrivateTransactionReceiptAndTransaction},
provenance::Origin, provenance::Origin,
receipt::Receipt, receipt::Receipt,
rpc_settings::RpcSettings, rpc_settings::RpcSettings,

51
rpc/src/v1/types/private_receipt.rs
View File

@ -1,51 +0,0 @@
// 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 ethcore_private_tx::Receipt as EthPrivateReceipt;
use ethereum_types::{H160, H256};
use v1::types::TransactionRequest;
/// Receipt
#[derive(Debug, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct PrivateTransactionReceipt {
/// Transaction Hash
pub transaction_hash: H256,
/// Private contract address
pub contract_address: H160,
/// Status code
#[serde(rename = "status")]
pub status_code: u8,
}
impl From<EthPrivateReceipt> for PrivateTransactionReceipt {
fn from(r: EthPrivateReceipt) -> Self {
PrivateTransactionReceipt {
transaction_hash: r.hash,
contract_address: r.contract_address,
status_code: r.status_code,
}
}
}
/// Receipt and Transaction
#[derive(Debug, Serialize)]
pub struct PrivateTransactionReceiptAndTransaction {
/// Receipt
pub receipt: PrivateTransactionReceipt,
/// Transaction
pub transaction: TransactionRequest,
}

5
util/fetch/src/client.rs
View File

@ -479,11 +479,6 @@ impl Response {
self.status() == StatusCode::OK self.status() == StatusCode::OK
} }
/// Status code == 404.
pub fn is_not_found(&self) -> bool {
self.status() == StatusCode::NOT_FOUND
}
/// Is the content-type text/html? /// Is the content-type text/html?
pub fn is_html(&self) -> bool { pub fn is_html(&self) -> bool {
self.headers self.headers