7b2afdfc8c
* Tx permission contract improvement * Take in account zero gas price certification when doing transact_contract * DRY in ServiceTransactionChecker * Fix typos and regroup mod * Introduce CertifiedAddressesCache * Introduce refresh_cache for CertifiedAddressesCache * Add CertifiedAddressesCache read and write on checking * Refresh CertifiedAddressesCache on new imported block * Separate ChainInfo trait and fix errors after merge * Do not fire an error when service txes contract does not exist * WIP: Shared certified addresses cache between miner and client + use HashMap instead of BTreeMap * Refactor refresh_cache for ServiceTransactionChecker * Refresh cache fixes * Add cache read in check_address + log when cache is used + improve code * Remove ChainInfo from ServiceTransaction dependencies * DRY ServiceTransactionChecker * Fix Client and Miner in tests * Fix node_filter test * Fix Client::new in add_peer_with_private_config * WIP: Separated ChainNotify from ethcore trait and implemented ChainNotify for ServiceTransactionChecker * Fix watcher test * Revert "Merge branch 'master' into master" This reverts commit 4e7371dc109d022efe3087defc33d827998ce648, reversing changes made to bffd73e5fd58a516bbf404281b51cf26422e181e. * Revert "Fix watcher test" This reverts commit bffd73e5fd58a516bbf404281b51cf26422e181e. * Revert "WIP: Separated ChainNotify from ethcore trait and implemented ChainNotify for ServiceTransactionChecker" This reverts commit 6e73d1e61fa15dc10ffd4fab63df29eabe9c3b3a. * Revert "Fix Client::new in add_peer_with_private_config" This reverts commit ec610a30bee95588d58b79edcc9e43c2ff90f1ad. * Revert "Fix node_filter test" This reverts commit 06a4b2de86317c902f579e912b40de0b0fbf6d78. * Revert "Fix Client and Miner in tests" This reverts commit 51bbad330ea6e7bdfc1516208cc8705d5d11516d. * Implement ServiceTransactionChecker in miner and delegate it to client + revert unnecessary changes * Merge master * Code improvements * Merge branch 'master' of https://github.com/paritytech/parity-ethereum # Conflicts: # Cargo.lock # ethcore/private-tx/src/lib.rs # ethcore/src/miner/miner.rs # ethcore/src/miner/pool_client.rs
95 lines
3.8 KiB
Rust
95 lines
3.8 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity Ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! A service transactions contract checker.
|
|
|
|
use std::collections::HashMap;
|
|
use std::mem;
|
|
use std::sync::Arc;
|
|
use call_contract::{RegistryInfo, CallContract};
|
|
use types::ids::BlockId;
|
|
use types::transaction::SignedTransaction;
|
|
use ethabi::FunctionOutputDecoder;
|
|
use ethereum_types::Address;
|
|
use parking_lot::RwLock;
|
|
|
|
use_contract!(service_transaction, "res/contracts/service_transaction.json");
|
|
|
|
const SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME: &'static str = "service_transaction_checker";
|
|
|
|
/// Service transactions checker.
|
|
#[derive(Default, Clone)]
|
|
pub struct ServiceTransactionChecker {
|
|
certified_addresses_cache: Arc<RwLock<HashMap<Address, bool>>>
|
|
}
|
|
|
|
impl ServiceTransactionChecker {
|
|
|
|
/// Checks if given address in tx is whitelisted to send service transactions.
|
|
pub fn check<C: CallContract + RegistryInfo>(&self, client: &C, tx: &SignedTransaction) -> Result<bool, String> {
|
|
let sender = tx.sender();
|
|
// Skip checking the contract if the transaction does not have zero gas price
|
|
if !tx.gas_price.is_zero() {
|
|
return Ok(false)
|
|
}
|
|
|
|
self.check_address(client, sender)
|
|
}
|
|
|
|
/// Checks if given address is whitelisted to send service transactions.
|
|
pub fn check_address<C: CallContract + RegistryInfo>(&self, client: &C, sender: Address) -> Result<bool, String> {
|
|
trace!(target: "txqueue", "Checking service transaction checker contract from {}", sender);
|
|
if let Some(allowed) = self.certified_addresses_cache.try_read().as_ref().and_then(|c| c.get(&sender)) {
|
|
return Ok(*allowed);
|
|
}
|
|
let contract_address = client.registry_address(SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME.to_owned(), BlockId::Latest)
|
|
.ok_or_else(|| "contract is not configured")?;
|
|
self.call_contract(client, contract_address, sender).and_then(|allowed| {
|
|
if let Some(mut cache) = self.certified_addresses_cache.try_write() {
|
|
cache.insert(sender, allowed);
|
|
};
|
|
Ok(allowed)
|
|
})
|
|
}
|
|
|
|
/// Refresh certified addresses cache
|
|
pub fn refresh_cache<C: CallContract + RegistryInfo>(&self, client: &C) -> Result<bool, String> {
|
|
trace!(target: "txqueue", "Refreshing certified addresses cache");
|
|
// replace the cache with an empty list,
|
|
// since it's not recent it won't be used anyway.
|
|
let cache = mem::replace(&mut *self.certified_addresses_cache.write(), HashMap::default());
|
|
|
|
if let Some(contract_address) = client.registry_address(SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME.to_owned(), BlockId::Latest) {
|
|
let addresses: Vec<_> = cache.keys().collect();
|
|
let mut cache: HashMap<Address, bool> = HashMap::default();
|
|
for address in addresses {
|
|
let allowed = self.call_contract(client, contract_address, *address)?;
|
|
cache.insert(*address, allowed);
|
|
}
|
|
mem::replace(&mut *self.certified_addresses_cache.write(), cache);
|
|
Ok(true)
|
|
} else {
|
|
Ok(false)
|
|
}
|
|
}
|
|
|
|
fn call_contract<C: CallContract + RegistryInfo>(&self, client: &C, contract_address: Address, sender: Address) -> Result<bool, String> {
|
|
let (data, decoder) = service_transaction::functions::certified::call(sender);
|
|
let value = client.call_contract(BlockId::Latest, contract_address, data)?;
|
|
decoder.decode(&value).map_err(|e| e.to_string())
|
|
}
|
|
}
|