From d94999967d6734e6a1576eb9ba4b9af657929b92 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 7 Jul 2015 13:04:30 -0700 Subject: [PATCH] Undo hard fork. --- libethereum/State.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libethereum/State.cpp b/libethereum/State.cpp index 8ba3b438a..f50545d08 100644 --- a/libethereum/State.cpp +++ b/libethereum/State.cpp @@ -1212,7 +1212,6 @@ ExecutionResult State::execute(LastHashes const& _lh, Transaction const& _t, Per uncommitToMine(); // OK - transaction looks valid - execute. - u256 startGasUsed = gasUsed(); #if ETH_PARANOIA ctrace << "Executing" << e.t() << "on" << h; ctrace << toHex(e.t().rlp()); @@ -1262,7 +1261,7 @@ ExecutionResult State::execute(LastHashes const& _lh, Transaction const& _t, Per // Add to the user-originated transactions that we've executed. m_transactions.push_back(e.t()); - m_receipts.push_back(TransactionReceipt(rootHash(), startGasUsed + (m_currentBlock.number >= 830000 ? e.gasUsedNoRefunds() : e.gasUsed()), e.logs())); + m_receipts.push_back(TransactionReceipt(rootHash(), e.gasUsed(), e.logs())); m_transactionSet.insert(e.t().sha3()); }