Merge branch 'develop' into p2p

libethereum/BlockQueue.cpp

@@ -107,7 +107,7 @@ ImportResult BlockQueue::import(bytesConstRef _block, BlockChain const& _bc)
 void BlockQueue::tick(BlockChain const& _bc)
 {
 	unsigned t = time(0);
-	for (auto i = m_future.begin(); i != m_future.end() && i->first < time(0); ++i)
+	for (auto i = m_future.begin(); i != m_future.end() && i->first < t; ++i)
 		import(&(i->second), _bc);
 
 	WriteGuard l(m_lock);

libethereum/Executive.cpp

@@ -236,6 +236,10 @@ bool Executive::go(OnOpFunc const& _onOp)
 
 void Executive::finalize()
 {
+	// Accumulate refunds for suicides.
+	if (m_ext)
+		m_ext->sub.refunds += c_suicideRefundGas * m_ext->sub.suicides.size();
+
 	// SSTORE refunds...
 	// must be done before the miner gets the fees.
 	if (m_ext)