From a1c68d6f8c37cbaf5f89a22318611ae022fc61df Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 7 Mar 2015 14:08:49 +0100 Subject: [PATCH] Suicide refunds. Compile fix. --- libethereum/BlockQueue.cpp | 2 +- libethereum/Executive.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libethereum/BlockQueue.cpp b/libethereum/BlockQueue.cpp index 01c8c796c..29c9a4c71 100644 --- a/libethereum/BlockQueue.cpp +++ b/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); diff --git a/libethereum/Executive.cpp b/libethereum/Executive.cpp index d8c80a577..607c0187e 100644 --- a/libethereum/Executive.cpp +++ b/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)