2018-06-04 10:19:50 +02:00
|
|
|
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
|
2018-04-09 16:14:33 +02:00
|
|
|
// 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/>.
|
|
|
|
|
|
|
|
//! Private transactions module.
|
|
|
|
|
|
|
|
// Recursion limit required because of
|
|
|
|
// error_chain foreign_links.
|
|
|
|
#![recursion_limit="256"]
|
|
|
|
|
|
|
|
mod encryptor;
|
|
|
|
mod private_transactions;
|
|
|
|
mod messages;
|
|
|
|
mod error;
|
|
|
|
|
|
|
|
extern crate ethcore;
|
Delete crates from parity-ethereum and fetch them from parity-common instead (#9083)
Use crates from parity-common: hashdb, keccak-hash, kvdb, kvdb-memorydb, kvdb-rocksdb, memorydb, parity-bytes, parity-crypto, path, patricia_trie, plain_hasher, rlp, target, test-support, trie-standardmap, triehash
2018-07-10 14:59:19 +02:00
|
|
|
extern crate parity_bytes as bytes;
|
|
|
|
extern crate parity_crypto as crypto;
|
2018-04-10 13:56:56 +02:00
|
|
|
extern crate ethcore_io as io;
|
2018-04-09 16:14:33 +02:00
|
|
|
extern crate ethcore_miner;
|
2018-04-10 13:56:56 +02:00
|
|
|
extern crate ethcore_transaction as transaction;
|
2018-04-09 16:14:33 +02:00
|
|
|
extern crate ethabi;
|
|
|
|
extern crate ethereum_types;
|
|
|
|
extern crate ethkey;
|
|
|
|
extern crate ethjson;
|
|
|
|
extern crate fetch;
|
|
|
|
extern crate futures;
|
2018-08-29 14:31:04 +02:00
|
|
|
extern crate heapsize;
|
2018-04-09 16:14:33 +02:00
|
|
|
extern crate keccak_hash as hash;
|
|
|
|
extern crate parking_lot;
|
|
|
|
extern crate patricia_trie as trie;
|
2018-08-29 14:31:04 +02:00
|
|
|
extern crate transaction_pool as txpool;
|
2018-07-02 18:50:05 +02:00
|
|
|
extern crate patricia_trie_ethereum as ethtrie;
|
2018-04-09 16:14:33 +02:00
|
|
|
extern crate rlp;
|
2018-04-10 13:51:29 +02:00
|
|
|
extern crate url;
|
2018-04-09 16:14:33 +02:00
|
|
|
extern crate rustc_hex;
|
|
|
|
#[macro_use]
|
|
|
|
extern crate log;
|
|
|
|
#[macro_use]
|
|
|
|
extern crate ethabi_derive;
|
|
|
|
#[macro_use]
|
|
|
|
extern crate ethabi_contract;
|
|
|
|
#[macro_use]
|
|
|
|
extern crate error_chain;
|
|
|
|
#[macro_use]
|
|
|
|
extern crate rlp_derive;
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
extern crate rand;
|
|
|
|
#[cfg(test)]
|
|
|
|
extern crate ethcore_logger;
|
|
|
|
|
|
|
|
pub use encryptor::{Encryptor, SecretStoreEncryptor, EncryptorConfig, NoopEncryptor};
|
2018-08-29 14:31:04 +02:00
|
|
|
pub use private_transactions::{VerifiedPrivateTransaction, VerificationStore, PrivateTransactionSigningDesc, SigningStore};
|
2018-04-09 16:14:33 +02:00
|
|
|
pub use messages::{PrivateTransaction, SignedPrivateTransaction};
|
|
|
|
pub use error::{Error, ErrorKind};
|
|
|
|
|
|
|
|
use std::sync::{Arc, Weak};
|
|
|
|
use std::collections::{HashMap, HashSet};
|
2018-04-27 15:04:27 +02:00
|
|
|
use std::time::Duration;
|
2018-04-09 16:14:33 +02:00
|
|
|
use ethereum_types::{H128, H256, U256, Address};
|
|
|
|
use hash::keccak;
|
|
|
|
use rlp::*;
|
2018-08-29 14:31:04 +02:00
|
|
|
use parking_lot::RwLock;
|
2018-04-09 16:14:33 +02:00
|
|
|
use bytes::Bytes;
|
|
|
|
use ethkey::{Signature, recover, public_to_address};
|
|
|
|
use io::IoChannel;
|
|
|
|
use ethcore::executive::{Executive, TransactOptions};
|
|
|
|
use ethcore::executed::{Executed};
|
|
|
|
use transaction::{SignedTransaction, Transaction, Action, UnverifiedTransaction};
|
|
|
|
use ethcore::{contract_address as ethcore_contract_address};
|
|
|
|
use ethcore::client::{
|
2018-11-28 13:14:40 +01:00
|
|
|
Client, ChainNotify, ChainRoute, ChainMessageType, ClientIoMessage, BlockId,
|
|
|
|
CallContract, Call, BlockInfo
|
2018-04-09 16:14:33 +02:00
|
|
|
};
|
|
|
|
use ethcore::account_provider::AccountProvider;
|
2018-07-05 17:27:48 +02:00
|
|
|
use ethcore::miner::{self, Miner, MinerService, pool_client::NonceCache};
|
2018-04-09 16:14:33 +02:00
|
|
|
use ethcore::trace::{Tracer, VMTracer};
|
|
|
|
use rustc_hex::FromHex;
|
2018-06-22 15:09:15 +02:00
|
|
|
use ethkey::Password;
|
2018-09-13 11:04:39 +02:00
|
|
|
use ethabi::FunctionOutputDecoder;
|
2018-04-09 16:14:33 +02:00
|
|
|
|
|
|
|
// Source avaiable at https://github.com/parity-contracts/private-tx/blob/master/contracts/PrivateContract.sol
|
|
|
|
const DEFAULT_STUB_CONTRACT: &'static str = include_str!("../res/private.evm");
|
|
|
|
|
2018-09-13 11:04:39 +02:00
|
|
|
use_contract!(private_contract, "res/private.json");
|
2018-04-09 16:14:33 +02:00
|
|
|
|
|
|
|
/// Initialization vector length.
|
|
|
|
const INIT_VEC_LEN: usize = 16;
|
|
|
|
|
2018-07-05 17:27:48 +02:00
|
|
|
/// Size of nonce cache
|
|
|
|
const NONCE_CACHE_SIZE: usize = 128;
|
|
|
|
|
2018-12-03 20:44:36 +01:00
|
|
|
/// Version for the initial private contract wrapper
|
|
|
|
const INITIAL_PRIVATE_CONTRACT_VER: usize = 1;
|
|
|
|
|
|
|
|
/// Version for the private contract notification about private state changes added
|
|
|
|
const PRIVATE_CONTRACT_WITH_NOTIFICATION_VER: usize = 2;
|
|
|
|
|
2018-04-09 16:14:33 +02:00
|
|
|
/// Configurtion for private transaction provider
|
|
|
|
#[derive(Default, PartialEq, Debug, Clone)]
|
|
|
|
pub struct ProviderConfig {
|
|
|
|
/// Accounts that can be used for validation
|
|
|
|
pub validator_accounts: Vec<Address>,
|
|
|
|
/// Account used for signing public transactions created from private transactions
|
|
|
|
pub signer_account: Option<Address>,
|
|
|
|
/// Passwords used to unlock accounts
|
2018-06-22 15:09:15 +02:00
|
|
|
pub passwords: Vec<Password>,
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
/// Private transaction execution receipt.
|
|
|
|
pub struct Receipt {
|
|
|
|
/// Private transaction hash.
|
|
|
|
pub hash: H256,
|
|
|
|
/// Created contract address if any.
|
|
|
|
pub contract_address: Option<Address>,
|
|
|
|
/// Execution status.
|
|
|
|
pub status_code: u8,
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Manager of private transactions
|
|
|
|
pub struct Provider {
|
|
|
|
encryptor: Box<Encryptor>,
|
|
|
|
validator_accounts: HashSet<Address>,
|
|
|
|
signer_account: Option<Address>,
|
2018-06-22 15:09:15 +02:00
|
|
|
passwords: Vec<Password>,
|
2018-04-09 16:14:33 +02:00
|
|
|
notify: RwLock<Vec<Weak<ChainNotify>>>,
|
2018-08-29 14:31:04 +02:00
|
|
|
transactions_for_signing: RwLock<SigningStore>,
|
|
|
|
transactions_for_verification: VerificationStore,
|
2018-04-09 16:14:33 +02:00
|
|
|
client: Arc<Client>,
|
2018-04-13 17:34:27 +02:00
|
|
|
miner: Arc<Miner>,
|
2018-04-09 16:14:33 +02:00
|
|
|
accounts: Arc<AccountProvider>,
|
|
|
|
channel: IoChannel<ClientIoMessage>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct PrivateExecutionResult<T, V> where T: Tracer, V: VMTracer {
|
|
|
|
code: Option<Bytes>,
|
|
|
|
state: Bytes,
|
|
|
|
contract_address: Option<Address>,
|
|
|
|
result: Executed<T::Output, V::Output>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Provider where {
|
|
|
|
/// Create a new provider.
|
|
|
|
pub fn new(
|
|
|
|
client: Arc<Client>,
|
2018-04-13 17:34:27 +02:00
|
|
|
miner: Arc<Miner>,
|
2018-04-09 16:14:33 +02:00
|
|
|
accounts: Arc<AccountProvider>,
|
|
|
|
encryptor: Box<Encryptor>,
|
|
|
|
config: ProviderConfig,
|
|
|
|
channel: IoChannel<ClientIoMessage>,
|
2018-05-09 08:49:34 +02:00
|
|
|
) -> Self {
|
|
|
|
Provider {
|
2018-04-09 16:14:33 +02:00
|
|
|
encryptor,
|
|
|
|
validator_accounts: config.validator_accounts.into_iter().collect(),
|
|
|
|
signer_account: config.signer_account,
|
|
|
|
passwords: config.passwords,
|
|
|
|
notify: RwLock::default(),
|
2018-08-29 14:31:04 +02:00
|
|
|
transactions_for_signing: RwLock::default(),
|
|
|
|
transactions_for_verification: VerificationStore::default(),
|
2018-04-09 16:14:33 +02:00
|
|
|
client,
|
2018-04-13 17:34:27 +02:00
|
|
|
miner,
|
2018-04-09 16:14:33 +02:00
|
|
|
accounts,
|
|
|
|
channel,
|
2018-05-09 08:49:34 +02:00
|
|
|
}
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// TODO [ToDr] Don't use `ChainNotify` here!
|
|
|
|
// Better to create a separate notification type for this.
|
|
|
|
/// Adds an actor to be notified on certain events
|
|
|
|
pub fn add_notify(&self, target: Arc<ChainNotify>) {
|
|
|
|
self.notify.write().push(Arc::downgrade(&target));
|
|
|
|
}
|
|
|
|
|
|
|
|
fn notify<F>(&self, f: F) where F: Fn(&ChainNotify) {
|
|
|
|
for np in self.notify.read().iter() {
|
|
|
|
if let Some(n) = np.upgrade() {
|
|
|
|
f(&*n);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// 1. Create private transaction from the signed transaction
|
|
|
|
/// 2. Executes private transaction
|
|
|
|
/// 3. Save it with state returned on prev step to the queue for signing
|
|
|
|
/// 4. Broadcast corresponding message to the chain
|
|
|
|
pub fn create_private_transaction(&self, signed_transaction: SignedTransaction) -> Result<Receipt, Error> {
|
2018-08-29 14:31:04 +02:00
|
|
|
trace!(target: "privatetx", "Creating private transaction from regular transaction: {:?}", signed_transaction);
|
2018-04-09 16:14:33 +02:00
|
|
|
if self.signer_account.is_none() {
|
2018-08-29 14:31:04 +02:00
|
|
|
warn!(target: "privatetx", "Signing account not set");
|
2018-04-09 16:14:33 +02:00
|
|
|
bail!(ErrorKind::SignerAccountNotSet);
|
|
|
|
}
|
|
|
|
let tx_hash = signed_transaction.hash();
|
2018-12-03 20:44:36 +01:00
|
|
|
let contract = Self::contract_address_from_transaction(&signed_transaction).map_err(|_| ErrorKind::BadTransactonType)?;
|
|
|
|
let data = signed_transaction.rlp_bytes();
|
|
|
|
let encrypted_transaction = self.encrypt(&contract, &Self::iv_from_transaction(&signed_transaction), &data)?;
|
|
|
|
let private = PrivateTransaction::new(encrypted_transaction, contract);
|
|
|
|
// TODO #9825 [ToDr] Using BlockId::Latest is bad here,
|
|
|
|
// the block may change in the middle of execution
|
|
|
|
// causing really weird stuff to happen.
|
|
|
|
// We should retrieve hash and stick to that. IMHO
|
|
|
|
// best would be to change the API and only allow H256 instead of BlockID
|
|
|
|
// in private-tx to avoid such mistakes.
|
|
|
|
let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest)?;
|
|
|
|
let private_state = self.execute_private_transaction(BlockId::Latest, &signed_transaction)?;
|
|
|
|
trace!(target: "privatetx", "Private transaction created, encrypted transaction: {:?}, private state: {:?}", private, private_state);
|
|
|
|
let contract_validators = self.get_validators(BlockId::Latest, &contract)?;
|
|
|
|
trace!(target: "privatetx", "Required validators: {:?}", contract_validators);
|
|
|
|
let private_state_hash = self.calculate_state_hash(&private_state, contract_nonce);
|
|
|
|
trace!(target: "privatetx", "Hashed effective private state for sender: {:?}", private_state_hash);
|
|
|
|
self.transactions_for_signing.write().add_transaction(private.hash(), signed_transaction, contract_validators, private_state, contract_nonce)?;
|
|
|
|
self.broadcast_private_transaction(private.hash(), private.rlp_bytes());
|
|
|
|
Ok(Receipt {
|
|
|
|
hash: tx_hash,
|
|
|
|
contract_address: Some(contract),
|
|
|
|
status_code: 0,
|
|
|
|
})
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Calculate hash from united private state and contract nonce
|
|
|
|
pub fn calculate_state_hash(&self, state: &Bytes, nonce: U256) -> H256 {
|
|
|
|
let state_hash = keccak(state);
|
|
|
|
let mut state_buf = [0u8; 64];
|
|
|
|
state_buf[..32].clone_from_slice(&state_hash);
|
|
|
|
state_buf[32..].clone_from_slice(&H256::from(nonce));
|
|
|
|
keccak(&state_buf.as_ref())
|
|
|
|
}
|
|
|
|
|
2018-07-05 17:27:48 +02:00
|
|
|
fn pool_client<'a>(&'a self, nonce_cache: &'a NonceCache) -> miner::pool_client::PoolClient<'a, Client> {
|
2018-04-13 17:34:27 +02:00
|
|
|
let engine = self.client.engine();
|
|
|
|
let refuse_service_transactions = true;
|
|
|
|
miner::pool_client::PoolClient::new(
|
|
|
|
&*self.client,
|
|
|
|
nonce_cache,
|
|
|
|
engine,
|
|
|
|
Some(&*self.accounts),
|
|
|
|
refuse_service_transactions,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2018-04-09 16:14:33 +02:00
|
|
|
/// Retrieve and verify the first available private transaction for every sender
|
2018-08-29 14:31:04 +02:00
|
|
|
fn process_verification_queue(&self) -> Result<(), Error> {
|
2018-07-05 17:27:48 +02:00
|
|
|
let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
|
2018-08-29 14:31:04 +02:00
|
|
|
let process_transaction = |transaction: &VerifiedPrivateTransaction| -> Result<_, String> {
|
|
|
|
let private_hash = transaction.private_transaction.hash();
|
|
|
|
match transaction.validator_account {
|
|
|
|
None => {
|
|
|
|
trace!(target: "privatetx", "Propagating transaction further");
|
2018-10-09 22:07:25 +02:00
|
|
|
self.broadcast_private_transaction(private_hash, transaction.private_transaction.rlp_bytes());
|
2018-08-29 14:31:04 +02:00
|
|
|
return Ok(());
|
|
|
|
}
|
|
|
|
Some(validator_account) => {
|
|
|
|
if !self.validator_accounts.contains(&validator_account) {
|
|
|
|
trace!(target: "privatetx", "Propagating transaction further");
|
2018-10-09 22:07:25 +02:00
|
|
|
self.broadcast_private_transaction(private_hash, transaction.private_transaction.rlp_bytes());
|
2018-08-29 14:31:04 +02:00
|
|
|
return Ok(());
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
2018-12-03 20:44:36 +01:00
|
|
|
let contract = Self::contract_address_from_transaction(&transaction.transaction)
|
|
|
|
.map_err(|_| "Incorrect type of action for the transaction")?;
|
|
|
|
// TODO #9825 [ToDr] Usage of BlockId::Latest
|
|
|
|
let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest);
|
|
|
|
if let Err(e) = contract_nonce {
|
|
|
|
bail!("Cannot retrieve contract nonce: {:?}", e);
|
|
|
|
}
|
|
|
|
let contract_nonce = contract_nonce.expect("Error was checked before");
|
|
|
|
let private_state = self.execute_private_transaction(BlockId::Latest, &transaction.transaction);
|
|
|
|
if let Err(e) = private_state {
|
|
|
|
bail!("Cannot retrieve private state: {:?}", e);
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
2018-12-03 20:44:36 +01:00
|
|
|
let private_state = private_state.expect("Error was checked before");
|
|
|
|
let private_state_hash = self.calculate_state_hash(&private_state, contract_nonce);
|
|
|
|
trace!(target: "privatetx", "Hashed effective private state for validator: {:?}", private_state_hash);
|
|
|
|
let password = find_account_password(&self.passwords, &*self.accounts, &validator_account);
|
|
|
|
let signed_state = self.accounts.sign(validator_account, password, private_state_hash);
|
|
|
|
if let Err(e) = signed_state {
|
|
|
|
bail!("Cannot sign the state: {:?}", e);
|
|
|
|
}
|
|
|
|
let signed_state = signed_state.expect("Error was checked before");
|
|
|
|
let signed_private_transaction = SignedPrivateTransaction::new(private_hash, signed_state, None);
|
|
|
|
trace!(target: "privatetx", "Sending signature for private transaction: {:?}", signed_private_transaction);
|
|
|
|
self.broadcast_signed_private_transaction(signed_private_transaction.hash(), signed_private_transaction.rlp_bytes());
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
}
|
2018-08-29 14:31:04 +02:00
|
|
|
Ok(())
|
|
|
|
};
|
|
|
|
let ready_transactions = self.transactions_for_verification.drain(self.pool_client(&nonce_cache));
|
|
|
|
for transaction in ready_transactions {
|
|
|
|
if let Err(e) = process_transaction(&transaction) {
|
|
|
|
warn!(target: "privatetx", "Error: {:?}", e);
|
|
|
|
}
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
2018-08-29 14:31:04 +02:00
|
|
|
/// Add signed private transaction into the store
|
|
|
|
/// Creates corresponding public transaction if last required signature collected and sends it to the chain
|
|
|
|
pub fn process_signature(&self, signed_tx: &SignedPrivateTransaction) -> Result<(), Error> {
|
|
|
|
trace!(target: "privatetx", "Processing signed private transaction");
|
|
|
|
let private_hash = signed_tx.private_transaction_hash();
|
|
|
|
let desc = match self.transactions_for_signing.read().get(&private_hash) {
|
|
|
|
None => {
|
|
|
|
// Not our transaction, broadcast further to peers
|
2018-10-09 22:07:25 +02:00
|
|
|
self.broadcast_signed_private_transaction(signed_tx.hash(), signed_tx.rlp_bytes());
|
2018-08-29 14:31:04 +02:00
|
|
|
return Ok(());
|
|
|
|
},
|
|
|
|
Some(desc) => desc,
|
|
|
|
};
|
|
|
|
let last = self.last_required_signature(&desc, signed_tx.signature())?;
|
|
|
|
|
|
|
|
if last {
|
|
|
|
let mut signatures = desc.received_signatures.clone();
|
|
|
|
signatures.push(signed_tx.signature());
|
|
|
|
let rsv: Vec<Signature> = signatures.into_iter().map(|sign| sign.into_electrum().into()).collect();
|
2018-12-03 20:44:36 +01:00
|
|
|
// Create public transaction
|
2018-08-29 14:31:04 +02:00
|
|
|
let public_tx = self.public_transaction(
|
|
|
|
desc.state.clone(),
|
|
|
|
&desc.original_transaction,
|
|
|
|
&rsv,
|
|
|
|
desc.original_transaction.nonce,
|
|
|
|
desc.original_transaction.gas_price
|
|
|
|
)?;
|
|
|
|
trace!(target: "privatetx", "Last required signature received, public transaction created: {:?}", public_tx);
|
2018-12-03 20:44:36 +01:00
|
|
|
// Sign and add it to the queue
|
2018-08-29 14:31:04 +02:00
|
|
|
let chain_id = desc.original_transaction.chain_id();
|
|
|
|
let hash = public_tx.hash(chain_id);
|
|
|
|
let signer_account = self.signer_account.ok_or_else(|| ErrorKind::SignerAccountNotSet)?;
|
|
|
|
let password = find_account_password(&self.passwords, &*self.accounts, &signer_account);
|
|
|
|
let signature = self.accounts.sign(signer_account, password, hash)?;
|
|
|
|
let signed = SignedTransaction::new(public_tx.with_signature(signature, chain_id))?;
|
|
|
|
match self.miner.import_own_transaction(&*self.client, signed.into()) {
|
|
|
|
Ok(_) => trace!(target: "privatetx", "Public transaction added to queue"),
|
|
|
|
Err(err) => {
|
|
|
|
warn!(target: "privatetx", "Failed to add transaction to queue, error: {:?}", err);
|
|
|
|
bail!(err);
|
|
|
|
}
|
|
|
|
}
|
2018-12-03 20:44:36 +01:00
|
|
|
// Notify about state changes
|
|
|
|
let contract = Self::contract_address_from_transaction(&desc.original_transaction)?;
|
|
|
|
// TODO #9825 Usage of BlockId::Latest
|
|
|
|
if self.get_contract_version(BlockId::Latest, &contract) >= PRIVATE_CONTRACT_WITH_NOTIFICATION_VER {
|
|
|
|
match self.state_changes_notify(BlockId::Latest, &contract, &desc.original_transaction.sender(), desc.original_transaction.hash()) {
|
|
|
|
Ok(_) => trace!(target: "privatetx", "Notification about private state changes sent"),
|
|
|
|
Err(err) => warn!(target: "privatetx", "Failed to send private state changed notification, error: {:?}", err),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Remove from store for signing
|
2018-08-29 14:31:04 +02:00
|
|
|
if let Err(err) = self.transactions_for_signing.write().remove(&private_hash) {
|
|
|
|
warn!(target: "privatetx", "Failed to remove transaction from signing store, error: {:?}", err);
|
|
|
|
bail!(err);
|
|
|
|
}
|
|
|
|
} else {
|
2018-12-03 20:44:36 +01:00
|
|
|
// Add signature to the store
|
2018-08-29 14:31:04 +02:00
|
|
|
match self.transactions_for_signing.write().add_signature(&private_hash, signed_tx.signature()) {
|
|
|
|
Ok(_) => trace!(target: "privatetx", "Signature stored for private transaction"),
|
|
|
|
Err(err) => {
|
|
|
|
warn!(target: "privatetx", "Failed to add signature to signing store, error: {:?}", err);
|
|
|
|
bail!(err);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
2018-12-03 20:44:36 +01:00
|
|
|
fn contract_address_from_transaction(transaction: &SignedTransaction) -> Result<Address, Error> {
|
|
|
|
match transaction.action {
|
|
|
|
Action::Call(contract) => Ok(contract),
|
|
|
|
_ => {
|
|
|
|
warn!(target: "privatetx", "Incorrect type of action for the transaction");
|
|
|
|
bail!(ErrorKind::BadTransactonType);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-09 16:14:33 +02:00
|
|
|
fn last_required_signature(&self, desc: &PrivateTransactionSigningDesc, sign: Signature) -> Result<bool, Error> {
|
|
|
|
if desc.received_signatures.contains(&sign) {
|
|
|
|
return Ok(false);
|
|
|
|
}
|
|
|
|
let state_hash = self.calculate_state_hash(&desc.state, desc.contract_nonce);
|
|
|
|
match recover(&sign, &state_hash) {
|
|
|
|
Ok(public) => {
|
|
|
|
let sender = public_to_address(&public);
|
|
|
|
match desc.validators.contains(&sender) {
|
|
|
|
true => {
|
|
|
|
Ok(desc.received_signatures.len() + 1 == desc.validators.len())
|
|
|
|
}
|
|
|
|
false => {
|
2018-08-29 14:31:04 +02:00
|
|
|
warn!(target: "privatetx", "Sender's state doesn't correspond to validator's");
|
2018-04-09 16:14:33 +02:00
|
|
|
bail!(ErrorKind::StateIncorrect);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Err(err) => {
|
2018-08-29 14:31:04 +02:00
|
|
|
warn!(target: "privatetx", "Sender's state doesn't correspond to validator's, error {:?}", err);
|
2018-04-09 16:14:33 +02:00
|
|
|
bail!(err);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Broadcast the private transaction message to the chain
|
2018-08-29 14:31:04 +02:00
|
|
|
fn broadcast_private_transaction(&self, transaction_hash: H256, message: Bytes) {
|
|
|
|
self.notify(|notify| notify.broadcast(ChainMessageType::PrivateTransaction(transaction_hash, message.clone())));
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Broadcast signed private transaction message to the chain
|
2018-08-29 14:31:04 +02:00
|
|
|
fn broadcast_signed_private_transaction(&self, transaction_hash: H256, message: Bytes) {
|
|
|
|
self.notify(|notify| notify.broadcast(ChainMessageType::SignedPrivateTransaction(transaction_hash, message.clone())));
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn iv_from_transaction(transaction: &SignedTransaction) -> H128 {
|
|
|
|
let nonce = keccak(&transaction.nonce.rlp_bytes());
|
|
|
|
let (iv, _) = nonce.split_at(INIT_VEC_LEN);
|
|
|
|
H128::from_slice(iv)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn iv_from_address(contract_address: &Address) -> H128 {
|
|
|
|
let address = keccak(&contract_address.rlp_bytes());
|
|
|
|
let (iv, _) = address.split_at(INIT_VEC_LEN);
|
|
|
|
H128::from_slice(iv)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn encrypt(&self, contract_address: &Address, initialisation_vector: &H128, data: &[u8]) -> Result<Bytes, Error> {
|
2018-08-29 14:31:04 +02:00
|
|
|
trace!(target: "privatetx", "Encrypt data using key(address): {:?}", contract_address);
|
2018-04-09 16:14:33 +02:00
|
|
|
Ok(self.encryptor.encrypt(contract_address, &*self.accounts, initialisation_vector, data)?)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn decrypt(&self, contract_address: &Address, data: &[u8]) -> Result<Bytes, Error> {
|
2018-08-29 14:31:04 +02:00
|
|
|
trace!(target: "privatetx", "Decrypt data using key(address): {:?}", contract_address);
|
2018-04-09 16:14:33 +02:00
|
|
|
Ok(self.encryptor.decrypt(contract_address, &*self.accounts, data)?)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn get_decrypted_state(&self, address: &Address, block: BlockId) -> Result<Bytes, Error> {
|
2018-09-13 11:04:39 +02:00
|
|
|
let (data, decoder) = private_contract::functions::state::call();
|
|
|
|
let value = self.client.call_contract(block, *address, data)?;
|
|
|
|
let state = decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?;
|
2018-04-09 16:14:33 +02:00
|
|
|
self.decrypt(address, &state)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn get_decrypted_code(&self, address: &Address, block: BlockId) -> Result<Bytes, Error> {
|
2018-09-13 11:04:39 +02:00
|
|
|
let (data, decoder) = private_contract::functions::code::call();
|
|
|
|
let value = self.client.call_contract(block, *address, data)?;
|
|
|
|
let state = decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?;
|
|
|
|
self.decrypt(address, &state)
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_contract_nonce(&self, address: &Address, block: BlockId) -> Result<U256, Error> {
|
2018-09-13 11:04:39 +02:00
|
|
|
let (data, decoder) = private_contract::functions::nonce::call();
|
|
|
|
let value = self.client.call_contract(block, *address, data)?;
|
|
|
|
decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)).into())
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn snapshot_to_storage(raw: Bytes) -> HashMap<H256, H256> {
|
|
|
|
let items = raw.len() / 64;
|
|
|
|
(0..items).map(|i| {
|
|
|
|
let offset = i * 64;
|
|
|
|
let key = H256::from_slice(&raw[offset..(offset + 32)]);
|
|
|
|
let value = H256::from_slice(&raw[(offset + 32)..(offset + 64)]);
|
|
|
|
(key, value)
|
|
|
|
}).collect()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn snapshot_from_storage(storage: &HashMap<H256, H256>) -> Bytes {
|
|
|
|
let mut raw = Vec::with_capacity(storage.len() * 64);
|
|
|
|
for (key, value) in storage {
|
|
|
|
raw.extend_from_slice(key);
|
|
|
|
raw.extend_from_slice(value);
|
|
|
|
};
|
|
|
|
raw
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn execute_private<T, V>(&self, transaction: &SignedTransaction, options: TransactOptions<T, V>, block: BlockId) -> Result<PrivateExecutionResult<T, V>, Error>
|
|
|
|
where
|
|
|
|
T: Tracer,
|
|
|
|
V: VMTracer,
|
|
|
|
{
|
|
|
|
let mut env_info = self.client.env_info(block).ok_or(ErrorKind::StatePruned)?;
|
|
|
|
env_info.gas_limit = transaction.gas;
|
|
|
|
|
|
|
|
let mut state = self.client.state_at(block).ok_or(ErrorKind::StatePruned)?;
|
2018-12-03 20:44:36 +01:00
|
|
|
// TODO #9825 in case of BlockId::Latest these need to operate on the same state
|
2018-04-09 16:14:33 +02:00
|
|
|
let contract_address = match transaction.action {
|
|
|
|
Action::Call(ref contract_address) => {
|
|
|
|
let contract_code = Arc::new(self.get_decrypted_code(contract_address, block)?);
|
|
|
|
let contract_state = self.get_decrypted_state(contract_address, block)?;
|
2018-08-29 14:31:04 +02:00
|
|
|
trace!(target: "privatetx", "Patching contract at {:?}, code: {:?}, state: {:?}", contract_address, contract_code, contract_state);
|
2018-04-09 16:14:33 +02:00
|
|
|
state.patch_account(contract_address, contract_code, Self::snapshot_to_storage(contract_state))?;
|
|
|
|
Some(*contract_address)
|
|
|
|
},
|
|
|
|
Action::Create => None,
|
|
|
|
};
|
|
|
|
|
|
|
|
let engine = self.client.engine();
|
|
|
|
let contract_address = contract_address.or({
|
|
|
|
let sender = transaction.sender();
|
|
|
|
let nonce = state.nonce(&sender)?;
|
|
|
|
let (new_address, _) = ethcore_contract_address(engine.create_address_scheme(env_info.number), &sender, &nonce, &transaction.data);
|
|
|
|
Some(new_address)
|
|
|
|
});
|
2018-07-23 15:48:01 +02:00
|
|
|
let machine = engine.machine();
|
|
|
|
let schedule = machine.schedule(env_info.number);
|
|
|
|
let result = Executive::new(&mut state, &env_info, &machine, &schedule).transact_virtual(transaction, options)?;
|
2018-04-09 16:14:33 +02:00
|
|
|
let (encrypted_code, encrypted_storage) = match contract_address {
|
|
|
|
None => bail!(ErrorKind::ContractDoesNotExist),
|
|
|
|
Some(address) => {
|
|
|
|
let (code, storage) = state.into_account(&address)?;
|
2018-10-31 16:55:11 +01:00
|
|
|
trace!(target: "privatetx", "Private contract executed. code: {:?}, state: {:?}, result: {:?}", code, storage, result.output);
|
2018-04-09 16:14:33 +02:00
|
|
|
let enc_code = match code {
|
|
|
|
Some(c) => Some(self.encrypt(&address, &Self::iv_from_address(&address), &c)?),
|
|
|
|
None => None,
|
|
|
|
};
|
|
|
|
(enc_code, self.encrypt(&address, &Self::iv_from_transaction(transaction), &Self::snapshot_from_storage(&storage))?)
|
|
|
|
},
|
|
|
|
};
|
|
|
|
Ok(PrivateExecutionResult {
|
|
|
|
code: encrypted_code,
|
|
|
|
state: encrypted_storage,
|
|
|
|
contract_address,
|
|
|
|
result,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
fn generate_constructor(validators: &[Address], code: Bytes, storage: Bytes) -> Bytes {
|
|
|
|
let constructor_code = DEFAULT_STUB_CONTRACT.from_hex().expect("Default contract code is valid");
|
2018-09-13 11:04:39 +02:00
|
|
|
private_contract::constructor(constructor_code, validators.iter().map(|a| *a).collect::<Vec<Address>>(), code, storage)
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn generate_set_state_call(signatures: &[Signature], storage: Bytes) -> Bytes {
|
2018-09-13 11:04:39 +02:00
|
|
|
private_contract::functions::set_state::encode_input(
|
2018-04-09 16:14:33 +02:00
|
|
|
storage,
|
|
|
|
signatures.iter().map(|s| {
|
|
|
|
let mut v: [u8; 32] = [0; 32];
|
|
|
|
v[31] = s.v();
|
|
|
|
v
|
|
|
|
}).collect::<Vec<[u8; 32]>>(),
|
|
|
|
signatures.iter().map(|s| s.r()).collect::<Vec<&[u8]>>(),
|
|
|
|
signatures.iter().map(|s| s.s()).collect::<Vec<&[u8]>>()
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the key from the key server associated with the contract
|
|
|
|
pub fn contract_key_id(&self, contract_address: &Address) -> Result<H256, Error> {
|
2018-12-03 20:44:36 +01:00
|
|
|
// Current solution uses contract address extended with 0 as id
|
2018-04-09 16:14:33 +02:00
|
|
|
let contract_address_extended: H256 = contract_address.into();
|
|
|
|
|
|
|
|
Ok(H256::from_slice(&contract_address_extended))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Create encrypted public contract deployment transaction.
|
|
|
|
pub fn public_creation_transaction(&self, block: BlockId, source: &SignedTransaction, validators: &[Address], gas_price: U256) -> Result<(Transaction, Option<Address>), Error> {
|
|
|
|
if let Action::Call(_) = source.action {
|
|
|
|
bail!(ErrorKind::BadTransactonType);
|
|
|
|
}
|
|
|
|
let sender = source.sender();
|
|
|
|
let state = self.client.state_at(block).ok_or(ErrorKind::StatePruned)?;
|
|
|
|
let nonce = state.nonce(&sender)?;
|
|
|
|
let executed = self.execute_private(source, TransactOptions::with_no_tracing(), block)?;
|
2018-11-28 13:14:40 +01:00
|
|
|
let header = self.client.block_header(block)
|
|
|
|
.ok_or(ErrorKind::StatePruned)
|
|
|
|
.and_then(|h| h.decode().map_err(|_| ErrorKind::StateIncorrect).into())?;
|
|
|
|
let (executed_code, executed_state) = (executed.code.unwrap_or_default(), executed.state);
|
|
|
|
let tx_data = Self::generate_constructor(validators, executed_code.clone(), executed_state.clone());
|
|
|
|
let mut tx = Transaction {
|
2018-04-09 16:14:33 +02:00
|
|
|
nonce: nonce,
|
|
|
|
action: Action::Create,
|
2018-11-28 13:14:40 +01:00
|
|
|
gas: u64::max_value().into(),
|
2018-04-09 16:14:33 +02:00
|
|
|
gas_price: gas_price,
|
|
|
|
value: source.value,
|
2018-11-28 13:14:40 +01:00
|
|
|
data: tx_data,
|
|
|
|
};
|
|
|
|
tx.gas = match self.client.estimate_gas(&tx.clone().fake_sign(sender), &state, &header) {
|
|
|
|
Ok(estimated_gas) => estimated_gas,
|
|
|
|
Err(_) => self.estimate_tx_gas(validators, &executed_code, &executed_state, &[]),
|
|
|
|
};
|
|
|
|
|
|
|
|
Ok((tx, executed.contract_address))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn estimate_tx_gas(&self, validators: &[Address], code: &Bytes, state: &Bytes, signatures: &[Signature]) -> U256 {
|
|
|
|
let default_gas = 650000 +
|
|
|
|
validators.len() as u64 * 30000 +
|
|
|
|
code.len() as u64 * 8000 +
|
|
|
|
signatures.len() as u64 * 50000 +
|
|
|
|
state.len() as u64 * 8000;
|
|
|
|
default_gas.into()
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Create encrypted public contract deployment transaction. Returns updated encrypted state.
|
|
|
|
pub fn execute_private_transaction(&self, block: BlockId, source: &SignedTransaction) -> Result<Bytes, Error> {
|
|
|
|
if let Action::Create = source.action {
|
|
|
|
bail!(ErrorKind::BadTransactonType);
|
|
|
|
}
|
|
|
|
let result = self.execute_private(source, TransactOptions::with_no_tracing(), block)?;
|
|
|
|
Ok(result.state)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Create encrypted public transaction from private transaction.
|
|
|
|
pub fn public_transaction(&self, state: Bytes, source: &SignedTransaction, signatures: &[Signature], nonce: U256, gas_price: U256) -> Result<Transaction, Error> {
|
2018-11-28 13:14:40 +01:00
|
|
|
let gas = self.estimate_tx_gas(&[], &Vec::new(), &state, signatures);
|
2018-04-09 16:14:33 +02:00
|
|
|
Ok(Transaction {
|
|
|
|
nonce: nonce,
|
|
|
|
action: source.action.clone(),
|
|
|
|
gas: gas.into(),
|
|
|
|
gas_price: gas_price,
|
|
|
|
value: 0.into(),
|
|
|
|
data: Self::generate_set_state_call(signatures, state)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Call into private contract.
|
|
|
|
pub fn private_call(&self, block: BlockId, transaction: &SignedTransaction) -> Result<Executed, Error> {
|
|
|
|
let result = self.execute_private(transaction, TransactOptions::with_no_tracing(), block)?;
|
|
|
|
Ok(result.result)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns private validators for a contract.
|
|
|
|
pub fn get_validators(&self, block: BlockId, address: &Address) -> Result<Vec<Address>, Error> {
|
2018-09-13 11:04:39 +02:00
|
|
|
let (data, decoder) = private_contract::functions::get_validators::call();
|
|
|
|
let value = self.client.call_contract(block, *address, data)?;
|
|
|
|
decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)).into())
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
2018-12-03 20:44:36 +01:00
|
|
|
|
|
|
|
fn get_contract_version(&self, block: BlockId, address: &Address) -> usize {
|
|
|
|
let (data, decoder) = private_contract::functions::get_version::call();
|
|
|
|
match self.client.call_contract(block, *address, data)
|
|
|
|
.and_then(|value| decoder.decode(&value).map_err(|e| e.to_string())) {
|
|
|
|
Ok(version) => version.low_u64() as usize,
|
|
|
|
Err(_) => INITIAL_PRIVATE_CONTRACT_VER,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn state_changes_notify(&self, block: BlockId, address: &Address, originator: &Address, transaction_hash: H256) -> Result<(), Error> {
|
|
|
|
let (data, _) = private_contract::functions::notify_changes::call(*originator, transaction_hash.0.to_vec());
|
|
|
|
let _value = self.client.call_contract(block, *address, data)?;
|
|
|
|
Ok(())
|
|
|
|
}
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
|
2018-05-09 08:49:34 +02:00
|
|
|
pub trait Importer {
|
|
|
|
/// Process received private transaction
|
2018-08-29 14:31:04 +02:00
|
|
|
fn import_private_transaction(&self, _rlp: &[u8]) -> Result<H256, Error>;
|
2018-05-09 08:49:34 +02:00
|
|
|
|
|
|
|
/// Add signed private transaction into the store
|
|
|
|
///
|
|
|
|
/// Creates corresponding public transaction if last required signature collected and sends it to the chain
|
2018-08-29 14:31:04 +02:00
|
|
|
fn import_signed_private_transaction(&self, _rlp: &[u8]) -> Result<H256, Error>;
|
2018-05-09 08:49:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// TODO [ToDr] Offload more heavy stuff to the IoService thread.
|
|
|
|
// It seems that a lot of heavy work (verification) is done in this thread anyway
|
|
|
|
// it might actually make sense to decouple it from clientService and just use dedicated thread
|
|
|
|
// for both verification and execution.
|
|
|
|
|
|
|
|
impl Importer for Arc<Provider> {
|
2018-08-29 14:31:04 +02:00
|
|
|
fn import_private_transaction(&self, rlp: &[u8]) -> Result<H256, Error> {
|
|
|
|
trace!(target: "privatetx", "Private transaction received");
|
2018-05-09 08:49:34 +02:00
|
|
|
let private_tx: PrivateTransaction = Rlp::new(rlp).as_val()?;
|
2018-08-29 14:31:04 +02:00
|
|
|
let private_tx_hash = private_tx.hash();
|
|
|
|
let contract = private_tx.contract();
|
2018-05-09 08:49:34 +02:00
|
|
|
let contract_validators = self.get_validators(BlockId::Latest, &contract)?;
|
|
|
|
|
|
|
|
let validation_account = contract_validators
|
|
|
|
.iter()
|
|
|
|
.find(|address| self.validator_accounts.contains(address));
|
|
|
|
|
2018-12-03 20:44:36 +01:00
|
|
|
// Extract the original transaction
|
2018-08-29 14:31:04 +02:00
|
|
|
let encrypted_data = private_tx.encrypted();
|
|
|
|
let transaction_bytes = self.decrypt(&contract, &encrypted_data)?;
|
|
|
|
let original_tx: UnverifiedTransaction = Rlp::new(&transaction_bytes).as_val()?;
|
|
|
|
let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
|
2018-12-03 20:44:36 +01:00
|
|
|
// Add to the queue for further verification
|
2018-08-29 14:31:04 +02:00
|
|
|
self.transactions_for_verification.add_transaction(
|
|
|
|
original_tx,
|
|
|
|
validation_account.map(|&account| account),
|
|
|
|
private_tx,
|
|
|
|
self.pool_client(&nonce_cache),
|
|
|
|
)?;
|
|
|
|
let provider = Arc::downgrade(self);
|
|
|
|
let result = self.channel.send(ClientIoMessage::execute(move |_| {
|
|
|
|
if let Some(provider) = provider.upgrade() {
|
|
|
|
if let Err(e) = provider.process_verification_queue() {
|
|
|
|
warn!(target: "privatetx", "Unable to process the queue: {}", e);
|
|
|
|
}
|
2018-05-09 08:49:34 +02:00
|
|
|
}
|
2018-08-29 14:31:04 +02:00
|
|
|
}));
|
|
|
|
if let Err(e) = result {
|
|
|
|
warn!(target: "privatetx", "Error sending NewPrivateTransaction message: {:?}", e);
|
2018-05-09 08:49:34 +02:00
|
|
|
}
|
2018-08-29 14:31:04 +02:00
|
|
|
Ok(private_tx_hash)
|
2018-05-09 08:49:34 +02:00
|
|
|
}
|
|
|
|
|
2018-08-29 14:31:04 +02:00
|
|
|
fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<H256, Error> {
|
2018-05-09 08:49:34 +02:00
|
|
|
let tx: SignedPrivateTransaction = Rlp::new(rlp).as_val()?;
|
2018-08-29 14:31:04 +02:00
|
|
|
trace!(target: "privatetx", "Signature for private transaction received: {:?}", tx);
|
2018-05-09 08:49:34 +02:00
|
|
|
let private_hash = tx.private_transaction_hash();
|
2018-08-29 14:31:04 +02:00
|
|
|
let provider = Arc::downgrade(self);
|
|
|
|
let result = self.channel.send(ClientIoMessage::execute(move |_| {
|
|
|
|
if let Some(provider) = provider.upgrade() {
|
|
|
|
if let Err(e) = provider.process_signature(&tx) {
|
|
|
|
warn!(target: "privatetx", "Unable to process the signature: {}", e);
|
2018-05-09 08:49:34 +02:00
|
|
|
}
|
|
|
|
}
|
2018-08-29 14:31:04 +02:00
|
|
|
}));
|
|
|
|
if let Err(e) = result {
|
|
|
|
warn!(target: "privatetx", "Error sending NewSignedPrivateTransaction message: {:?}", e);
|
2018-05-09 08:49:34 +02:00
|
|
|
}
|
2018-08-29 14:31:04 +02:00
|
|
|
Ok(private_hash)
|
2018-05-09 08:49:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-09 16:14:33 +02:00
|
|
|
/// Try to unlock account using stored password, return found password if any
|
2018-06-22 15:09:15 +02:00
|
|
|
fn find_account_password(passwords: &Vec<Password>, account_provider: &AccountProvider, account: &Address) -> Option<Password> {
|
2018-04-09 16:14:33 +02:00
|
|
|
for password in passwords {
|
|
|
|
if let Ok(true) = account_provider.test_password(account, password) {
|
|
|
|
return Some(password.clone());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ChainNotify for Provider {
|
2018-05-07 12:58:25 +02:00
|
|
|
fn new_blocks(&self, imported: Vec<H256>, _invalid: Vec<H256>, _route: ChainRoute, _sealed: Vec<H256>, _proposed: Vec<Bytes>, _duration: Duration) {
|
2018-04-09 16:14:33 +02:00
|
|
|
if !imported.is_empty() {
|
2018-08-29 14:31:04 +02:00
|
|
|
trace!(target: "privatetx", "New blocks imported, try to prune the queue");
|
|
|
|
if let Err(err) = self.process_verification_queue() {
|
|
|
|
warn!(target: "privatetx", "Cannot prune private transactions queue. error: {:?}", err);
|
2018-04-09 16:14:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|