Implement caching for service transactions checker

ethcore/src/client/client.rs

@@ -62,6 +62,7 @@ use header::{BlockNumber, Header, ExtendedHeader};
 use io::IoChannel;
 use log_entry::LocalizedLogEntry;
 use miner::{Miner, MinerService};
+use miner::service_transaction_checker::ServiceTransactionChecker;
 use ethcore_miner::pool::VerifiedTransaction;
 use parking_lot::{Mutex, RwLock};
 use rand::OsRng;
@@ -2112,10 +2113,15 @@ impl BlockChainClient for Client {
 
  fn transact_contract(&self, address: Address, data: Bytes) -> Result<(), transaction::Error> {
  let authoring_params = self.importer.miner.authoring_params();
+ let service_transaction_checker = ServiceTransactionChecker::default();
+ let gas_price = match service_transaction_checker.check_address(self, address) {
+ Ok(true) => U256::zero(),
+ _ => self.importer.miner.sensible_gas_price(),
+ };
  let transaction = Transaction {
  nonce: self.latest_nonce(&authoring_params.author),
  action: Action::Call(address),
- gas: self.importer.miner.sensible_gas_limit(),
+ gas: gas_price,
  gas_price: self.importer.miner.sensible_gas_price(),
  value: U256::zero(),
  data: data,

ethcore/src/miner/mod.rs

@@ -20,7 +20,7 @@
 //! Keeps track of transactions and currently sealed pending block.
 
 mod miner;
-mod service_transaction_checker;
+pub mod service_transaction_checker;
 
 pub mod pool_client;
 #[cfg(feature = "stratum")]

ethcore/src/miner/service_transaction_checker.rs

@@ -19,6 +19,7 @@
 use client::{RegistryInfo, CallContract, BlockId};
 use transaction::SignedTransaction;
 use ethabi::FunctionOutputDecoder;
+use ethereum_types::Address;
 
 use_contract!(service_transaction, "res/contracts/service_transaction.json");
 
@@ -29,7 +30,7 @@ const SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME: &'static str = "service_transa
 pub struct ServiceTransactionChecker;
 
 impl ServiceTransactionChecker {
- /// Checks if given address is whitelisted to send service transactions.
+ /// 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();
  let hash = tx.hash();
@@ -48,4 +49,13 @@ impl ServiceTransactionChecker {
  let value = client.call_contract(BlockId::Latest, address, data)?;
  decoder.decode(&value).map_err(|e| e.to_string())
  }
+
+ /// 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> {
+ let contract_address = client.registry_address(SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME.to_owned(), BlockId::Latest)
+ .ok_or_else(|| "contract is not configured")?;
+ 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())
+ }
 }