Implement caching for service transactions checker

Cargo.toml

@@ -134,3 +134,6 @@ members = [
  "parity-clib",
  "whisper/cli",
 ]
+
+[patch.crates-io]
+heapsize = { git = "https://github.com/cheme/heapsize.git", branch = "ec-macfix" }

docs/CHANGELOG-2.2.md

@@ -1,4 +1,4 @@
-## Parity-Ethereum [v2.2.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.7) (2018-01-15)
+## Parity-Ethereum [v2.2.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.7) (2019-01-15)
 
 Parity-Ethereum 2.2.7-stable is a consensus-relevant security release that reverts Constantinople on the Ethereum network. Upgrading is mandatory for Ethereum, and strongly recommended for other networks.
 

ethcore/private-tx/src/lib.rs

@@ -243,13 +243,12 @@ impl Provider where {
 
  fn pool_client<'a>(&'a self, nonce_cache: &'a NonceCache) -> miner::pool_client::PoolClient<'a, Client> {
  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,
+ None, // refuse_service_transactions = true
  )
  }
 

ethcore/src/client/client.rs

@@ -25,7 +25,6 @@ use blockchain::{BlockReceipts, BlockChain, BlockChainDB, BlockProvider, TreeRou
 use bytes::Bytes;
 use call_contract::{CallContract, RegistryInfo};
 use ethcore_miner::pool::VerifiedTransaction;
-use ethcore_miner::service_transaction_checker::ServiceTransactionChecker;
 use ethereum_types::{H256, Address, U256};
 use evm::Schedule;
 use hash::keccak;
@@ -2157,10 +2156,14 @@ 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, authoring_params.author) {
- Ok(true) => U256::zero(),
- _ => self.importer.miner.sensible_gas_price(),
+ let service_transaction_checker = self.importer.miner.service_transaction_checker();
+ let gas_price = if let Some(checker) = service_transaction_checker {
+ match checker.check_address(self, authoring_params.author) {
+ Ok(true) => U256::zero(),
+ _ => self.importer.miner.sensible_gas_price(),
+ }
+ } else {
+ self.importer.miner.sensible_gas_price()
  };
  let transaction = transaction::Transaction {
  nonce: self.latest_nonce(&authoring_params.author),

ethcore/src/miner/miner.rs

@@ -24,6 +24,7 @@ use bytes::Bytes;
 use call_contract::CallContract;
 use ethcore_miner::gas_pricer::GasPricer;
 use ethcore_miner::pool::{self, TransactionQueue, VerifiedTransaction, QueueStatus, PrioritizationStrategy};
+use ethcore_miner::service_transaction_checker::ServiceTransactionChecker;
 #[cfg(feature = "work-notify")]
 use ethcore_miner::work_notify::NotifyWork;
 use ethereum_types::{H256, U256, Address};
@@ -232,6 +233,7 @@ pub struct Miner {
  engine: Arc<EthEngine>,
  accounts: Option<Arc<AccountProvider>>,
  io_channel: RwLock<Option<IoChannel<ClientIoMessage>>>,
+ service_transaction_checker: Option<ServiceTransactionChecker>,
 }
 
 impl Miner {
@@ -258,6 +260,7 @@ impl Miner {
  let verifier_options = options.pool_verification_options.clone();
  let tx_queue_strategy = options.tx_queue_strategy;
  let nonce_cache_size = cmp::max(4096, limits.max_count / 4);
+ let refuse_service_transactions = options.refuse_service_transactions.clone();
 
  Miner {
  sealing: Mutex::new(SealingWork {
@@ -278,6 +281,11 @@ impl Miner {
  accounts,
  engine: spec.engine.clone(),
  io_channel: RwLock::new(None),
+ service_transaction_checker: if refuse_service_transactions {
+ None
+ } else {
+ Some(ServiceTransactionChecker::new())
+ },
  }
  }
 
@@ -336,6 +344,11 @@ impl Miner {
  });
  }
 
+ /// Returns ServiceTransactionChecker
+ pub fn service_transaction_checker(&self) -> Option<ServiceTransactionChecker> {
+ self.service_transaction_checker.clone()
+ }
+
  /// Retrieves an existing pending block iff it's not older than given block number.
  ///
  /// NOTE: This will not prepare a new pending block if it's not existing.
@@ -363,7 +376,7 @@ impl Miner {
  &self.nonce_cache,
  &*self.engine,
  self.accounts.as_ref().map(|x| &**x),
- self.options.refuse_service_transactions,
+ self.service_transaction_checker.as_ref(),
  )
  }
 
@@ -1248,15 +1261,15 @@ impl miner::MinerService for Miner {
  let nonce_cache = self.nonce_cache.clone();
  let engine = self.engine.clone();
  let accounts = self.accounts.clone();
- let refuse_service_transactions = self.options.refuse_service_transactions;
+ let service_transaction_checker = self.service_transaction_checker.clone();
 
  let cull = move |chain: &::client::Client| {
  let client = PoolClient::new(
  chain,
  &nonce_cache,
  &*engine,
  accounts.as_ref().map(|x| &**x),
- refuse_service_transactions,
+ service_transaction_checker.as_ref(),
  );
  queue.cull(client);
  };
@@ -1268,6 +1281,17 @@ impl miner::MinerService for Miner {
  self.transaction_queue.cull(client);
  }
  }
+ if self.service_transaction_checker.is_some() {
+ match self.service_transaction_checker.clone().unwrap().refresh_cache(chain) {
+ Ok(true) => {
+ trace!(target: "client", "Service transaction cache was refreshed successfully");
+ },
+ Ok(false) => {
+ trace!(target: "client", "Registrar or/and service transactions contract does not exist");
+ },
+ Err(e) => error!(target: "client", "Error occurred while refreshing service transaction cache: {}", e)
+ };
+ };
  }
 
  fn pending_state(&self, latest_block_number: BlockNumber) -> Option<Self::State> {

ethcore/src/miner/pool_client.rs

@@ -75,7 +75,7 @@ pub struct PoolClient<'a, C: 'a> {
  engine: &'a EthEngine,
  accounts: Option<&'a AccountProvider>,
  best_block_header: Header,
- service_transaction_checker: Option<ServiceTransactionChecker>,
+ service_transaction_checker: Option<&'a ServiceTransactionChecker>,
 }
 
 impl<'a, C: 'a> Clone for PoolClient<'a, C> {
@@ -100,7 +100,7 @@ C: BlockInfo + CallContract,
  cache: &'a NonceCache,
  engine: &'a EthEngine,
  accounts: Option<&'a AccountProvider>,
- refuse_service_transactions: bool,
+ service_transaction_checker: Option<&'a ServiceTransactionChecker>,
  ) -> Self {
  let best_block_header = chain.best_block_header();
  PoolClient {
@@ -109,11 +109,7 @@ C: BlockInfo + CallContract,
  engine,
  accounts,
  best_block_header,
- service_transaction_checker: if refuse_service_transactions {
- None
- } else {
- Some(Default::default())
- },
+ service_transaction_checker
  }
  }