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

Merge branch 'master' into tx-limit-bug

Browse Source 
Conflicts:
	miner/src/transaction_queue.rs
This commit is contained in:
Tomasz Drwięga 2016-04-18 21:58:19 +02:00
commit cd044ec096
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ethcore/src/blockchain/blockchain.rs
View File

@ -830,7 +830,8 @@ impl BlockChain {
CacheID::Extras(ExtrasIndex::BlockLogBlooms, h) => { block_logs.remove(&h); }, CacheID::Extras(ExtrasIndex::BlockLogBlooms, h) => { block_logs.remove(&h); },
CacheID::Extras(ExtrasIndex::BlocksBlooms, h) => { blocks_blooms.remove(&h); }, CacheID::Extras(ExtrasIndex::BlocksBlooms, h) => { blocks_blooms.remove(&h); },
CacheID::Extras(ExtrasIndex::BlockReceipts, h) => { block_receipts.remove(&h); }, CacheID::Extras(ExtrasIndex::BlockReceipts, h) => { block_receipts.remove(&h); },
_ => panic!(), // TODO: debris, temporary fix
CacheID::Extras(ExtrasIndex::BlockHash, _) => { },
} }
} }
cache_man.cache_usage.push_front(HashSet::new()); cache_man.cache_usage.push_front(HashSet::new());

1
miner/src/transaction_queue.rs
View File

@ -628,6 +628,7 @@ impl TransactionQueue {
let future_tx = self.by_hash.remove(&order.hash).unwrap(); let future_tx = self.by_hash.remove(&order.hash).unwrap();
try!(check_too_cheap(Self::replace_transaction(future_tx, state_nonce, &mut self.current, &mut self.by_hash))); try!(check_too_cheap(Self::replace_transaction(future_tx, state_nonce, &mut self.current, &mut self.by_hash)));
} }
// Also enforce the limit // Also enforce the limit
if let Err(e) = check_if_removed(&hash, self.current.enforce_limit(&mut self.by_hash)) { if let Err(e) = check_if_removed(&hash, self.current.enforce_limit(&mut self.by_hash)) {
// If current transaction was removed because of limit we need to update last_nonces also. // If current transaction was removed because of limit we need to update last_nonces also.