diff options
Diffstat (limited to 'block.cpp')
| -rw-r--r-- | block.cpp | 144 |
1 files changed, 73 insertions, 71 deletions
@@ -81,6 +81,76 @@ bytes createBlockRLPFromFields(mObject& _tObj) return rlpStream.out(); } +void overwriteBlockHeader(mObject& _o, BlockInfo _current_BlockHeader) +{ + if (_o.count("blockHeader")) + { + if (_o["blockHeader"].get_obj().size() != 14) + { + + BlockInfo tmp = _current_BlockHeader; + + if (_o["blockHeader"].get_obj().count("parentHash")) + tmp.parentHash = h256(_o["blockHeader"].get_obj()["parentHash"].get_str()); + + if (_o["blockHeader"].get_obj().count("uncleHash")) + tmp.sha3Uncles = h256(_o["blockHeader"].get_obj()["uncleHash"].get_str()); + + if (_o["blockHeader"].get_obj().count("coinbase")) + tmp.coinbaseAddress = Address(_o["blockHeader"].get_obj()["coinbase"].get_str()); + + if (_o["blockHeader"].get_obj().count("stateRoot")) + tmp.stateRoot = h256(_o["blockHeader"].get_obj()["stateRoot"].get_str()); + + if (_o["blockHeader"].get_obj().count("transactionsTrie")) + tmp.transactionsRoot = h256(_o["blockHeader"].get_obj()["transactionsTrie"].get_str()); + + if (_o["blockHeader"].get_obj().count("receiptTrie")) + tmp.receiptsRoot = h256(_o["blockHeader"].get_obj()["receiptTrie"].get_str()); + + if (_o["blockHeader"].get_obj().count("bloom")) + tmp.logBloom = LogBloom(_o["blockHeader"].get_obj()["bloom"].get_str()); + + if (_o["blockHeader"].get_obj().count("difficulty")) + tmp.difficulty = toInt(_o["blockHeader"].get_obj()["difficulty"]); + + if (_o["blockHeader"].get_obj().count("number")) + tmp.number = toInt(_o["blockHeader"].get_obj()["number"]); + + if (_o["blockHeader"].get_obj().count("gasLimit")) + tmp.gasLimit = toInt(_o["blockHeader"].get_obj()["gasLimit"]); + + if (_o["blockHeader"].get_obj().count("gasUsed")) + tmp.gasUsed = toInt(_o["blockHeader"].get_obj()["gasUsed"]); + + if (_o["blockHeader"].get_obj().count("timestamp")) + tmp.timestamp = toInt(_o["blockHeader"].get_obj()["timestamp"]); + + if (_o["blockHeader"].get_obj().count("extraData")) + tmp.extraData = importByteArray(_o["blockHeader"].get_obj()["extraData"].get_str()); + + // find new valid nonce + + if (tmp != _current_BlockHeader) + { + _current_BlockHeader = tmp; + cout << "new header!\n"; + ProofOfWork pow; + MineInfo ret; + while (!ProofOfWork::verify(_current_BlockHeader.headerHash(WithoutNonce), _current_BlockHeader.nonce, _current_BlockHeader.difficulty)) + tie(ret, _current_BlockHeader.nonce) = pow.mine(_current_BlockHeader.headerHash(WithoutNonce), _current_BlockHeader.difficulty, 10000, true, true); + } + } + else + { + // take the blockheader as is + const bytes c_blockRLP = createBlockRLPFromFields(_o["blockHeader"].get_obj()); + const RLP c_bRLP(c_blockRLP); + _current_BlockHeader.populateFromHeader(c_bRLP, false); + } + } +} + void doBlockTests(json_spirit::mValue& _v, bool _fillin) { for (auto& i: _v.get_obj()) @@ -214,76 +284,9 @@ void doBlockTests(json_spirit::mValue& _v, bool _fillin) BlockInfo current_BlockHeader = state.info(); // overwrite blockheader with (possible wrong) data from "blockheader" in filler; - - if (o.count("blockHeader")) - { - if (o["blockHeader"].get_obj().size() != 14) - { - - BlockInfo tmp = current_BlockHeader; - - if (o["blockHeader"].get_obj().count("parentHash")) - tmp.parentHash = h256(o["blockHeader"].get_obj()["parentHash"].get_str()); - - if (o["blockHeader"].get_obj().count("uncleHash")) - tmp.sha3Uncles = h256(o["blockHeader"].get_obj()["uncleHash"].get_str()); - - if (o["blockHeader"].get_obj().count("coinbase")) - tmp.coinbaseAddress = Address(o["blockHeader"].get_obj()["coinbase"].get_str()); - - if (o["blockHeader"].get_obj().count("stateRoot")) - tmp.stateRoot = h256(o["blockHeader"].get_obj()["stateRoot"].get_str()); - - if (o["blockHeader"].get_obj().count("transactionsTrie")) - tmp.transactionsRoot = h256(o["blockHeader"].get_obj()["transactionsTrie"].get_str()); - - if (o["blockHeader"].get_obj().count("receiptTrie")) - tmp.receiptsRoot = h256(o["blockHeader"].get_obj()["receiptTrie"].get_str()); - - if (o["blockHeader"].get_obj().count("bloom")) - tmp.logBloom = LogBloom(o["blockHeader"].get_obj()["bloom"].get_str()); - - if (o["blockHeader"].get_obj().count("difficulty")) - tmp.difficulty = toInt(o["blockHeader"].get_obj()["difficulty"]); - - if (o["blockHeader"].get_obj().count("number")) - tmp.number = toInt(o["blockHeader"].get_obj()["number"]); - - if (o["blockHeader"].get_obj().count("gasLimit")) - tmp.gasLimit = toInt(o["blockHeader"].get_obj()["gasLimit"]); - - if (o["blockHeader"].get_obj().count("gasUsed")) - tmp.gasUsed = toInt(o["blockHeader"].get_obj()["gasUsed"]); - - if (o["blockHeader"].get_obj().count("timestamp")) - tmp.timestamp = toInt(o["blockHeader"].get_obj()["timestamp"]); - - if (o["blockHeader"].get_obj().count("extraData")) - tmp.extraData = importByteArray(o["blockHeader"].get_obj()["extraData"].get_str()); - - // find new valid nonce - - if (tmp != current_BlockHeader) - { - current_BlockHeader = tmp; - cout << "new header!\n"; - ProofOfWork pow; - MineInfo ret; - while (!ProofOfWork::verify(current_BlockHeader.headerHash(WithoutNonce), current_BlockHeader.nonce, current_BlockHeader.difficulty)) - tie(ret, current_BlockHeader.nonce) = pow.mine(current_BlockHeader.headerHash(WithoutNonce), current_BlockHeader.difficulty, 10000, true, true); - } - } - else - { - // take the blockheader as is - const bytes c_blockRLP = createBlockRLPFromFields(o["blockHeader"].get_obj()); - const RLP c_bRLP(c_blockRLP); - current_BlockHeader.populateFromHeader(c_bRLP, false); - } - } + overwriteBlockHeader(o, current_BlockHeader); // write block header - mObject oBlockHeader; oBlockHeader["parentHash"] = toString(current_BlockHeader.parentHash); oBlockHeader["uncleHash"] = toString(current_BlockHeader.sha3Uncles); @@ -423,7 +426,6 @@ void doBlockTests(json_spirit::mValue& _v, bool _fillin) BOOST_CHECK_MESSAGE(blockHeaderFromFields == blockFromRlp, "However, blockHeaderFromFields != blockFromRlp!"); //Check transaction list - Transactions txsFromField; for (auto const& txObj: o["transactions"].get_array()) @@ -511,9 +513,9 @@ BOOST_AUTO_TEST_CASE(blForkBlocks) dev::test::executeTests("blForkBlocks", "/BlockTests", dev::test::doBlockTests); } -BOOST_AUTO_TEST_CASE(userDefinedFileBl) +BOOST_AUTO_TEST_CASE(userDefinedFile) { - dev::test::userDefinedTest("--bltest", dev::test::doBlockTests); + dev::test::userDefinedTest("--singletest", dev::test::doBlockTests); } BOOST_AUTO_TEST_SUITE_END() |