lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

restore lost changes blockmining

cl-refactor
Dimitry 10 years ago
parent
e087e69213
commit
feea9ae73b
1 changed files with 118 additions and 119 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 237
      test/libethereum/blockchain.cpp

237
test/libethereum/blockchain.cpp
View File

@ -73,7 +73,7 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
BlockHeader biGenesisBlock = constructBlock(o["genesisBlockHeader"].get_obj(), h256{});
State trueState(OverlayDB(State::openDB(td_stateDB_tmp.path(), h256{}, WithExisting::Kill)), BaseState::Empty);
importer.importState(o["pre"].get_obj(), trueState);
ImportTest::importState(o["pre"].get_obj(), trueState);
o["pre"] = fillJsonWithState(trueState); //convert all fields to hex
trueState.commit();
@ -189,7 +189,6 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
}
}
bc.sync(uncleBlockQueue, state.db(), 4);
block.commitToSeal(bc);
//mine a new block on top of previously imported
try
@ -210,125 +209,125 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
}
// blObj["rlp"] = toHex(state.blockData(), 2, HexPrefix::Add);
// //get valid transactions
// Transactions txList;
// for (auto const& txi: txs.topTransactions(std::numeric_limits<unsigned>::max()))
// txList.push_back(txi);
// blObj["transactions"] = writeTransactionsToJson(txList);
// BlockHeader current_BlockHeader = state.info();
// RLPStream uncleStream;
// uncleStream.appendList(vBiUncles.size());
// for (unsigned i = 0; i < vBiUncles.size(); ++i)
// {
// RLPStream uncleRlp;
// vBiUncles[i].streamRLP(uncleRlp);
// uncleStream.appendRaw(uncleRlp.out());
// }
// if (blObj.count("blockHeader"))
// overwriteBlockHeader(current_BlockHeader, blObj);
// if (blObj.count("blockHeader") && blObj["blockHeader"].get_obj().count("bruncle"))
// current_BlockHeader.populateFromParent(vBiBlocks[vBiBlocks.size() -1]);
// if (vBiUncles.size())
// {
// // update unclehash in case of invalid uncles
// current_BlockHeader.setSha3Uncles(sha3(uncleStream.out()));
// updatePoW(current_BlockHeader);
// }
// // write block header
// mObject oBlockHeader;
// writeBlockHeaderToJson(oBlockHeader, current_BlockHeader);
// blObj["blockHeader"] = oBlockHeader;
// vBiBlocks.push_back(current_BlockHeader);
// // compare blocks from state and from rlp
// RLPStream txStream;
// txStream.appendList(txList.size());
// for (unsigned i = 0; i < txList.size(); ++i)
// {
// RLPStream txrlp;
// txList[i].streamRLP(txrlp);
// txStream.appendRaw(txrlp.out());
// }
// RLPStream block2 = createFullBlockFromHeader(current_BlockHeader, txStream.out(), uncleStream.out());
// blObj["rlp"] = toHex(block2.out(), 2, HexPrefix::Add);
// if (sha3(RLP(state.blockData())[0].data()) != sha3(RLP(block2.out())[0].data()))
// {
// cnote << "block header mismatch state.blockData() vs updated state.info()\n";
// cerr << toHex(state.blockData()) << "vs" << toHex(block2.out());
// }
// if (sha3(RLP(state.blockData())[1].data()) != sha3(RLP(block2.out())[1].data()))
// cnote << "txs mismatch\n";
// if (sha3(RLP(state.blockData())[2].data()) != sha3(RLP(block2.out())[2].data()))
// cnote << "uncle list mismatch\n" << RLP(state.blockData())[2].data() << "\n" << RLP(block2.out())[2].data();
// try
// {
// state.sync(bc);
// bc.import(block2.out(), state.db());
// state.sync(bc);
// state.commit();
// //there we get new blockchain status in state which could have more difficulty than we have in trueState
// //attempt to import new block to the true blockchain
// trueBc.sync(uncleBlockQueue, trueState.db(), 4);
// trueBc.attemptImport(block2.out(), trueState.db());
// trueState.sync(trueBc);
// blockSet newBlock;
// newBlock.first = block2.out();
// newBlock.second = uncleBlockQueueList;
// if (importBlockNumber < blockSets.size())
// {
// //make new correct history of imported blocks
// blockSets[importBlockNumber] = newBlock;
// for (size_t i = importBlockNumber + 1; i < blockSets.size(); i++)
// blockSets.pop_back();
// }
// else
// blockSets.push_back(newBlock);
// }
// // if exception is thrown, RLP is invalid and no blockHeader, Transaction list, or Uncle list should be given
// catch (...)
// {
// cnote << "block is invalid!\n";
// blObj.erase(blObj.find("blockHeader"));
// blObj.erase(blObj.find("uncleHeaders"));
// blObj.erase(blObj.find("transactions"));
// }
// blArray.push_back(blObj);
// this_thread::sleep_for(chrono::seconds(1));
blObj["rlp"] = toHex(block.blockData(), 2, HexPrefix::Add);
//get valid transactions
Transactions txList;
for (auto const& txi: txs.topTransactions(std::numeric_limits<unsigned>::max()))
txList.push_back(txi);
blObj["transactions"] = writeTransactionsToJson(txList);
BlockHeader current_BlockHeader = block.info();
RLPStream uncleStream;
uncleStream.appendList(vBiUncles.size());
for (unsigned i = 0; i < vBiUncles.size(); ++i)
{
RLPStream uncleRlp;
vBiUncles[i].streamRLP(uncleRlp);
uncleStream.appendRaw(uncleRlp.out());
}
if (blObj.count("blockHeader"))
overwriteBlockHeader(current_BlockHeader, blObj, bc.info());
if (blObj.count("blockHeader") && blObj["blockHeader"].get_obj().count("bruncle"))
current_BlockHeader.populateFromParent(vBiBlocks[vBiBlocks.size() -1]);
if (vBiUncles.size())
{
// update unclehash in case of invalid uncles
current_BlockHeader.setSha3Uncles(sha3(uncleStream.out()));
updatePoW(current_BlockHeader);
}
// write block header
mObject oBlockHeader;
writeBlockHeaderToJson(oBlockHeader, current_BlockHeader);
blObj["blockHeader"] = oBlockHeader;
vBiBlocks.push_back(current_BlockHeader);
// compare blocks from state and from rlp
RLPStream txStream;
txStream.appendList(txList.size());
for (unsigned i = 0; i < txList.size(); ++i)
{
RLPStream txrlp;
txList[i].streamRLP(txrlp);
txStream.appendRaw(txrlp.out());
}
RLPStream block2 = createFullBlockFromHeader(current_BlockHeader, txStream.out(), uncleStream.out());
blObj["rlp"] = toHex(block2.out(), 2, HexPrefix::Add);
if (sha3(RLP(block.blockData())[0].data()) != sha3(RLP(block2.out())[0].data()))
{
cnote << "block header mismatch block.blockData() vs updated block.info()\n";
cerr << toHex(RLP(block.blockData())[0].data()) << "vs" << toHex(RLP(block2.out())[0].data());
}
if (sha3(RLP(block.blockData())[1].data()) != sha3(RLP(block2.out())[1].data()))
cnote << "txs mismatch\n";
if (sha3(RLP(block.blockData())[2].data()) != sha3(RLP(block2.out())[2].data()))
cnote << "uncle list mismatch\n" << RLP(block.blockData())[2].data() << "\n" << RLP(block2.out())[2].data();
try
{
block.sync(bc);
bc.import(block2.out(), block.db());
block.sync(bc);
//block.commit();
//there we get new blockchain status in state which could have more difficulty than we have in trueState
//attempt to import new block to the true blockchain
trueBc.sync(uncleBlockQueue, trueState.db(), 4);
trueBc.attemptImport(block2.out(), trueState.db());
//trueState.sync(trueBc);
blockSet newBlock;
newBlock.first = block2.out();
newBlock.second = uncleBlockQueueList;
if (importBlockNumber < blockSets.size())
{
//make new correct history of imported blocks
blockSets[importBlockNumber] = newBlock;
for (size_t i = importBlockNumber + 1; i < blockSets.size(); i++)
blockSets.pop_back();
}
else
blockSets.push_back(newBlock);
}
// if exception is thrown, RLP is invalid and no blockHeader, Transaction list, or Uncle list should be given
catch (...)
{
cnote << "block is invalid!\n";
blObj.erase(blObj.find("blockHeader"));
blObj.erase(blObj.find("uncleHeaders"));
blObj.erase(blObj.find("transactions"));
}
blArray.push_back(blObj);
this_thread::sleep_for(chrono::seconds(1));
} //for blocks
// if (o.count("expect") > 0)
// {
// AccountMaskMap expectStateMap;
// State stateExpect(OverlayDB(), BaseState::Empty, biGenesisBlock.beneficiary());
// ImportTest::importState(o["expect"].get_obj(), stateExpect, expectStateMap);
// ImportTest::checkExpectedState(stateExpect, trueState, expectStateMap, Options::get().checkState ? WhenError::Throw : WhenError::DontThrow);
// o.erase(o.find("expect"));
// }
// o["blocks"] = blArray;
// o["postState"] = fillJsonWithState(trueState);
// o["lastblockhash"] = toString(trueBc.info().hash());
// //make all values hex in pre section
// State prestate(OverlayDB(), BaseState::Empty);
// ImportTest::importState(o["pre"].get_obj(), prestate);
// o["pre"] = fillJsonWithState(prestate);
if (o.count("expect") > 0)
{
AccountMaskMap expectStateMap;
State stateExpect(OverlayDB(), BaseState::Empty);
ImportTest::importState(o["expect"].get_obj(), stateExpect, expectStateMap);
ImportTest::compareStates(stateExpect, trueState, expectStateMap, Options::get().checkState ? WhenError::Throw : WhenError::DontThrow);
o.erase(o.find("expect"));
}
o["blocks"] = blArray;
o["postState"] = fillJsonWithState(trueState);
o["lastblockhash"] = toString(trueBc.info().hash());
//make all values hex in pre section
State prestate(OverlayDB(), BaseState::Empty);
ImportTest::importState(o["pre"].get_obj(), prestate);
o["pre"] = fillJsonWithState(prestate);
}//_fillin
else
{

Write Preview
Loading…
Cancel
Save