New Transaction Queue implementation (#8074)

* Implementation of Verifier, Scoring and Ready. * Queue in progress. * TransactionPool. * Prepare for txpool release. * Miner refactor [WiP] * WiP reworking miner. * Make it compile. * Add some docs. * Split blockchain access to a separate file. * Work on miner API. * Fix ethcore tests. * Refactor miner interface for sealing/work packages. * Implement next nonce. * RPC compiles. * Implement couple of missing methdods for RPC. * Add transaction queue listeners. * Compiles! * Clean-up and parallelize. * Get rid of RefCell in header. * Revert "Get rid of RefCell in header." This reverts commit 0f2424c9b7319a786e1565ea2a8a6d801a21b4fb. * Override Sync requirement. * Fix status display. * Unify logging. * Extract some cheap checks. * Measurements and optimizations. * Fix scoring bug, heap size of bug and add cache * Disable tx queueing and parallel verification. * Make ethcore and ethcore-miner compile again. * Make RPC compile again. * Bunch of txpool tests. * Migrate transaction queue tests. * Nonce Cap * Nonce cap cache and tests. * Remove stale future transactions from the queue. * Optimize scoring and write some tests. * Simple penalization. * Clean up and support for different scoring algorithms. * Add CLI parameters for the new queue. * Remove banning queue. * Disable debug build. * Change per_sender limit to be 1% instead of 5% * Avoid cloning when propagating transactions. * Remove old todo. * Post-review fixes. * Fix miner options default. * Implement back ready transactions for light client. * Get rid of from_pending_block * Pass rejection reason. * Add more details to drop. * Rollback heap size of. * Avoid cloning hashes when propagating and include more details on rejection. * Fix tests. * Introduce nonces cache. * Remove uneccessary hashes allocation. * Lower the mem limit. * Re-enable parallel verification. * Add miner log. Don't check the type if not below min_gas_price. * Add more traces, fix disabling miner. * Fix creating pending blocks twice on AuRa authorities. * Fix tests. * re-use pending blocks in AuRa * Use reseal_min_period to prevent too frequent update_sealing. * Fix log to contain hash not sender. * Optimize local transactions. * Fix aura tests. * Update locks comments. * Get rid of unsafe Sync impl. * Review fixes. * Remove excessive matches. * Fix compilation errors. * Use new pool in private transactions. * Fix private-tx test. * Fix secret store tests. * Actually use gas_floor_target * Fix config tests. * Fix pool tests. * Address grumbles.
2018-04-13 17:34:27 +02:00
parent 03b96a7c0a
commit 1cd93e4ceb
105 changed files with 5185 additions and 5784 deletions
--- a/miner/src/pool/mod.rs
+++ b/miner/src/pool/mod.rs
@@ -0,0 +1,135 @@
+// Copyright 2015-2017 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/>.
+
+//! Transaction Pool
+
+use ethereum_types::{H256, Address};
+use heapsize::HeapSizeOf;
+use transaction;
+use txpool;
+
+mod listener;
+mod queue;
+mod ready;
+mod scoring;
+
+pub mod client;
+pub mod local_transactions;
+pub mod verifier;
+
+#[cfg(test)]
+mod tests;
+
+pub use self::queue::{TransactionQueue, Status as QueueStatus};
+pub use self::txpool::{VerifiedTransaction as PoolVerifiedTransaction, Options};
+
+/// How to prioritize transactions in the pool
+///
+/// TODO [ToDr] Implement more strategies.
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum PrioritizationStrategy {
+	/// Simple gas-price based prioritization.
+	GasPriceOnly,
+}
+
+/// Transaction priority.
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub(crate) enum Priority {
+	/// Local transactions (high priority)
+	///
+	/// Transactions either from a local account or
+	/// submitted over local RPC connection via `eth_sendRawTransaction`
+	Local,
+	/// Transactions from retracted blocks (medium priority)
+	///
+	/// When block becomes non-canonical we re-import the transactions it contains
+	/// to the queue and boost their priority.
+	Retracted,
+	/// Regular transactions received over the network. (no priority boost)
+	Regular,
+}
+
+impl Priority {
+	fn is_local(&self) -> bool {
+		match *self {
+			Priority::Local => true,
+			_ => false,
+		}
+	}
+}
+
+/// Verified transaction stored in the pool.
+#[derive(Debug, PartialEq, Eq)]
+pub struct VerifiedTransaction {
+	transaction: transaction::PendingTransaction,
+	// TODO [ToDr] hash and sender should go directly from the transaction
+	hash: H256,
+	sender: Address,
+	priority: Priority,
+	insertion_id: usize,
+}
+
+impl VerifiedTransaction {
+	/// Create `VerifiedTransaction` directly from `SignedTransaction`.
+	///
+	/// This method should be used only:
+	/// 1. for tests
+	/// 2. In case we are converting pending block transactions that are already in the queue to match the function signature.
+	pub fn from_pending_block_transaction(tx: transaction::SignedTransaction) -> Self {
+		let hash = tx.hash();
+		let sender = tx.sender();
+		VerifiedTransaction {
+			transaction: tx.into(),
+			hash,
+			sender,
+			priority: Priority::Retracted,
+			insertion_id: 0,
+		}
+	}
+
+	/// Gets transaction priority.
+	pub(crate) fn priority(&self) -> Priority {
+		self.priority
+	}
+
+	/// Gets wrapped `SignedTransaction`
+	pub fn signed(&self) -> &transaction::SignedTransaction {
+		&self.transaction
+	}
+
+	/// Gets wrapped `PendingTransaction`
+	pub fn pending(&self) -> &transaction::PendingTransaction {
+		&self.transaction
+	}
+}
+
+impl txpool::VerifiedTransaction for VerifiedTransaction {
+	fn hash(&self) -> &H256 {
+		&self.hash
+	}
+
+	fn mem_usage(&self) -> usize {
+		self.transaction.heap_size_of_children()
+	}
+
+	fn sender(&self) -> &Address {
+		&self.sender
+	}
+
+	fn insertion_id(&self) -> u64 {
+		self.insertion_id as u64
+	}
+}