From c0713608ee52b8d043f35b95c27b70129959d58b Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 6 Aug 2015 12:01:31 +0200 Subject: [PATCH] Add fixes from previous. --- libethereum/Block.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libethereum/Block.cpp b/libethereum/Block.cpp index 20b21fefa..15de1acba 100644 --- a/libethereum/Block.cpp +++ b/libethereum/Block.cpp @@ -136,7 +136,7 @@ PopulationStatistics Block::populateFromChain(BlockChain const& _bc, h256 const& // 2. Enact the block's transactions onto this state. m_beneficiary = bi.beneficiary(); Timer t; - auto vb = _bc.verifyBlock(&b, function(), _ir); + auto vb = _bc.verifyBlock(&b, function(), _ir | ImportRequirements::TransactionBasic); ret.verify = t.elapsed(); t.restart(); enact(vb, _bc); @@ -460,7 +460,7 @@ u256 Block::enact(VerifiedBlockRef const& _block, BlockChain const& _bc) InvalidReceiptsStateRoot ex; ex << Hash256RequirementError(receiptsRoot, m_currentBlock.receiptsRoot()); ex << errinfo_receipts(receipts); - ex << errinfo_vmtrace(vmTrace(_block.block, _bc, ImportRequirements::None)); +// ex << errinfo_vmtrace(vmTrace(_block.block, _bc, ImportRequirements::None)); BOOST_THROW_EXCEPTION(ex); }