grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Getting rid of first_nonces (we can fetch it from state)

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-03-04 15:02:11 +01:00
parent 8542d651ae
commit b320ff4602
1 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
sync/src/transaction_queue.rs
View File

@ -158,10 +158,8 @@ pub struct TransactionQueue {
future: TransactionSet, future: TransactionSet,
/// All transactions managed by queue indexed by hash /// All transactions managed by queue indexed by hash
by_hash: HashMap<H256, VerifiedTransaction>, by_hash: HashMap<H256, VerifiedTransaction>,
/// Last nonce of transaction in current /// Last nonce of transaction in current (to quickly check next expected transaction)
last_nonces: HashMap<Address, U256>, last_nonces: HashMap<Address, U256>,
/// First nonce of transaction in current (used to determine priority)
first_nonces: HashMap<Address, U256>,
} }
impl TransactionQueue { impl TransactionQueue {
@ -188,7 +186,6 @@ impl TransactionQueue {
future: future, future: future,
by_hash: HashMap::new(), by_hash: HashMap::new(),
last_nonces: HashMap::new(), last_nonces: HashMap::new(),
first_nonces: HashMap::new(),
} }
} }
@ -217,16 +214,18 @@ impl TransactionQueue {
/// Removes all transactions identified by hashes given in slice /// Removes all transactions identified by hashes given in slice
/// ///
/// If gap is introduced marks subsequent transactions as future /// If gap is introduced marks subsequent transactions as future
pub fn remove_all(&mut self, txs: &[H256]) { pub fn remove_all<T>(&mut self, txs: &[H256], fetch_nonce: T)
where T: Fn(&Address) -> U256 {
for tx in txs { for tx in txs {
self.remove(&tx); self.remove(&tx, &fetch_nonce);
} }
} }
/// Removes transaction identified by hashes from queue. /// Removes transaction identified by hashes from queue.
/// ///
/// If gap is introduced marks subsequent transactions as future /// If gap is introduced marks subsequent transactions as future
pub fn remove(&mut self, hash: &H256) { pub fn remove<T>(&mut self, hash: &H256, fetch_nonce: &T)
where T: Fn(&Address) -> U256 {
let transaction = self.by_hash.remove(hash); let transaction = self.by_hash.remove(hash);
if transaction.is_none() { if transaction.is_none() {
// We don't know this transaction // We don't know this transaction
@ -249,11 +248,10 @@ impl TransactionQueue {
if !self.current.by_address.has_row(&sender) { if !self.current.by_address.has_row(&sender) {
// Clear last & first nonces // Clear last & first nonces
self.last_nonces.remove(&sender); self.last_nonces.remove(&sender);
self.first_nonces.remove(&sender);
return; return;
} }
// Let's find those with higher nonce (TODO [todr] optimize?) // Let's find those with higher nonce that should be moved to future (TODO [todr] optimize?)
let to_move_to_future = { let to_move_to_future = {
let row_map = self.current.by_address.row(&sender).unwrap(); let row_map = self.current.by_address.row(&sender).unwrap();
let mut to_future = Vec::new(); let mut to_future = Vec::new();
@ -271,23 +269,17 @@ impl TransactionQueue {
} }
} }
// Update first_nonces and last_nonces // Update last_nonces
if highest == U256::zero() { if highest == U256::zero() {
self.last_nonces.remove(&sender); self.last_nonces.remove(&sender);
} else { } else {
self.last_nonces.insert(sender.clone(), highest); self.last_nonces.insert(sender.clone(), highest);
} }
if lowest == nonce {
self.first_nonces.remove(&sender);
} else {
self.first_nonces.insert(sender.clone(), lowest);
}
// return to future
to_future to_future
}; };
// Move to future
for k in to_move_to_future { for k in to_move_to_future {
if let Some(v) = self.current.drop(&sender, &k) { if let Some(v) = self.current.drop(&sender, &k) {
// TODO [todr] Recalculate height? // TODO [todr] Recalculate height?
@ -295,6 +287,8 @@ impl TransactionQueue {
} }
} }
self.future.enforce_limit(&self.by_hash); self.future.enforce_limit(&self.by_hash);
// But maybe some transactions
} }
/// Returns top transactions from the queue /// Returns top transactions from the queue
@ -313,7 +307,6 @@ impl TransactionQueue {
self.future.clear(); self.future.clear();
self.by_hash.clear(); self.by_hash.clear();
self.last_nonces.clear(); self.last_nonces.clear();
self.first_nonces.clear();
} }
fn move_future_txs(&mut self, address: Address, current_nonce: U256, first_nonce: U256) -> Option<U256> { fn move_future_txs(&mut self, address: Address, current_nonce: U256, first_nonce: U256) -> Option<U256> {
@ -344,9 +337,10 @@ impl TransactionQueue {
let nonce = tx.nonce(); let nonce = tx.nonce();
let address = tx.sender(); let address = tx.sender();
let next_nonce = U256::one() + self.last_nonces let next_nonce = self.last_nonces
.get(&address) .get(&address)
.cloned() .cloned()
.map(|n| n + U256::one())
.unwrap_or_else(|| fetch_nonce(&address)); .unwrap_or_else(|| fetch_nonce(&address));
// Check height // Check height
@ -363,20 +357,15 @@ impl TransactionQueue {
return; return;
} }
let first_nonce = self.first_nonces let base_nonce = fetch_nonce(&address);
.get(&address) let order = TransactionOrder::for_transaction(&tx, base_nonce);
.cloned()
.unwrap_or_else(|| nonce.clone());
let order = TransactionOrder::for_transaction(&tx, first_nonce);
// Insert to by_hash // Insert to by_hash
self.by_hash.insert(tx.hash(), tx); self.by_hash.insert(tx.hash(), tx);
// Insert to current // Insert to current
self.current.insert(address.clone(), nonce, order); self.current.insert(address.clone(), nonce, order);
// But maybe there are some more items waiting in future? // But maybe there are some more items waiting in future?
let new_last_nonce = self.move_future_txs(address.clone(), nonce, first_nonce); let new_last_nonce = self.move_future_txs(address.clone(), nonce, base_nonce);
self.first_nonces.insert(address.clone(), first_nonce);
self.last_nonces.insert(address.clone(), new_last_nonce.unwrap_or(nonce)); self.last_nonces.insert(address.clone(), new_last_nonce.unwrap_or(nonce));
// Enforce limit // Enforce limit
self.current.enforce_limit(&self.by_hash); self.current.enforce_limit(&self.by_hash);
@ -414,7 +403,7 @@ mod test {
} }
fn default_nonce(_address: &Address) -> U256 { fn default_nonce(_address: &Address) -> U256 {
U256::from(122) U256::from(123)
} }
fn new_txs(second_nonce: U256) -> (SignedTransaction, SignedTransaction) { fn new_txs(second_nonce: U256) -> (SignedTransaction, SignedTransaction) {
@ -554,8 +543,8 @@ mod test {
assert_eq!(txq2.status().future, 1); assert_eq!(txq2.status().future, 1);
// when // when
txq2.remove(&tx.hash()); txq2.remove(&tx.hash(), &default_nonce);
txq2.remove(&tx2.hash()); txq2.remove(&tx2.hash(), &default_nonce);
// then // then
@ -577,7 +566,7 @@ mod test {
assert_eq!(txq.status().pending, 3); assert_eq!(txq.status().pending, 3);
// when // when
txq.remove(&tx.hash()); txq.remove(&tx.hash(), &default_nonce);
// then // then
let stats = txq.status(); let stats = txq.status();
@ -645,7 +634,7 @@ mod test {
fn should_drop_transactions_with_old_nonces() { fn should_drop_transactions_with_old_nonces() {
let mut txq = TransactionQueue::new(); let mut txq = TransactionQueue::new();
let tx = new_tx(); let tx = new_tx();
let last_nonce = tx.nonce.clone(); let last_nonce = tx.nonce.clone() + U256::one();
let fetch_last_nonce = |_a: &Address| last_nonce; let fetch_last_nonce = |_a: &Address| last_nonce;
// when // when
@ -667,7 +656,7 @@ mod test {
assert_eq!(txq.status().pending, 2); assert_eq!(txq.status().pending, 2);
// when // when
txq.remove(&tx1.hash()); txq.remove(&tx1.hash(), &default_nonce);
assert_eq!(txq.status().pending, 0); assert_eq!(txq.status().pending, 0);
assert_eq!(txq.status().future, 1); assert_eq!(txq.status().future, 1);
txq.add(tx1.clone(), &default_nonce); txq.add(tx1.clone(), &default_nonce);
@ -676,7 +665,28 @@ mod test {
let stats = txq.status(); let stats = txq.status();
assert_eq!(stats.future, 0); assert_eq!(stats.future, 0);
assert_eq!(stats.pending, 2); assert_eq!(stats.pending, 2);
}
#[test]
fn should_not_move_to_future_if_state_nonce_is_higher() {
// given
let next_nonce = |a: &Address| default_nonce(a) + U256::one();
let mut txq = TransactionQueue::new();
let (tx, tx2) = new_txs(U256::from(1));
let tx3 = new_tx();
txq.add(tx2.clone(), &default_nonce);
assert_eq!(txq.status().future, 1);
txq.add(tx3.clone(), &default_nonce);
txq.add(tx.clone(), &default_nonce);
assert_eq!(txq.status().pending, 3);
// when
txq.remove(&tx.hash(), &next_nonce);
// then
let stats = txq.status();
assert_eq!(stats.future, 0);
assert_eq!(stats.pending, 2);
} }
} }