From 66a216f7042f018512870c899e59534e5b2212f1 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 12 Mar 2015 18:10:27 +0000 Subject: [PATCH] Remove seedHash from header. --- blockchain.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/blockchain.cpp b/blockchain.cpp index eca08d09e..045f2de5b 100644 --- a/blockchain.cpp +++ b/blockchain.cpp @@ -313,7 +313,6 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin) BOOST_CHECK_MESSAGE(blockHeaderFromFields.timestamp == blockFromRlp.timestamp, "timestamp in given RLP not matching the block timestamp!"); BOOST_CHECK_MESSAGE(blockHeaderFromFields.extraData == blockFromRlp.extraData, "extraData in given RLP not matching the block extraData!"); BOOST_CHECK_MESSAGE(blockHeaderFromFields.mixHash == blockFromRlp.mixHash, "mixHash in given RLP not matching the block mixHash!"); - BOOST_CHECK_MESSAGE(blockHeaderFromFields.seedHash == blockFromRlp.seedHash, "transactionsRoot in given RLP not matching the block transactionsRoot!"); BOOST_CHECK_MESSAGE(blockHeaderFromFields.nonce == blockFromRlp.nonce, "nonce in given RLP not matching the block nonce!"); BOOST_CHECK_MESSAGE(blockHeaderFromFields == blockFromRlp, "However, blockHeaderFromFields != blockFromRlp!"); @@ -466,9 +465,6 @@ bytes createBlockRLPFromFields(mObject& _tObj) if (_tObj.count("extraData")) rlpStream << fromHex(_tObj["extraData"].get_str()); - if (_tObj.count("seedHash")) - rlpStream << importByteArray(_tObj["seedHash"].get_str()); - if (_tObj.count("mixHash")) rlpStream << importByteArray(_tObj["mixHash"].get_str()); @@ -527,9 +523,6 @@ void overwriteBlockHeader(BlockInfo& _current_BlockHeader, mObject& _blObj) if (_blObj["blockHeader"].get_obj().count("mixHash")) tmp.mixHash = h256(_blObj["blockHeader"].get_obj()["mixHash"].get_str()); - if (_blObj["blockHeader"].get_obj().count("seedHash")) - tmp.seedHash = h256(_blObj["blockHeader"].get_obj()["seedHash"].get_str()); - // find new valid nonce if (tmp != _current_BlockHeader) @@ -609,7 +602,6 @@ void writeBlockHeaderToJson(mObject& _o, const BlockInfo& _bi) _o["timestamp"] = toString(_bi.timestamp); _o["extraData"] ="0x" + toHex(_bi.extraData); _o["mixHash"] = toString(_bi.mixHash); - _o["seedHash"] = toString(_bi.seedHash); _o["nonce"] = toString(_bi.nonce); _o["hash"] = toString(_bi.hash); }