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
2bc972f4c7
commit
4f29904441
1 changed files with 145 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 269
      test/libethereum/blockchain.cpp

269
test/libethereum/blockchain.cpp
View File

@ -29,6 +29,8 @@
#include <test/TestHelper.h> #include <test/TestHelper.h>
#include <libethereum/Block.h> #include <libethereum/Block.h>
#include <libethereum/GenesisInfo.h>
using namespace std; using namespace std;
using namespace json_spirit; using namespace json_spirit;
using namespace dev; using namespace dev;
@ -53,6 +55,8 @@ mArray importUncles(mObject const& _blObj, vector<BlockHeader>& _vBiUncles, vect
void doBlockchainTests(json_spirit::mValue& _v, bool _fillin) void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
{ {
_fillin = true;
for (auto& i: _v.get_obj()) for (auto& i: _v.get_obj())
{ {
mObject& o = i.second.get_obj(); mObject& o = i.second.get_obj();
@ -69,12 +73,25 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
ImportTest importer(o, _fillin, testType::BlockChainTests); ImportTest importer(o, _fillin, testType::BlockChainTests);
TransientDirectory td_stateDB_tmp; TransientDirectory td_stateDB_tmp;
BlockHeader biGenesisBlock = constructBlock(o["genesisBlockHeader"].get_obj(), h256{}); BlockHeader biGenesisBlock = constructBlock(o["genesisBlockHeader"].get_obj(), h256{});
State trueState(OverlayDB(State::openDB(td_stateDB_tmp.path(), h256{}, WithExisting::Kill)), BaseState::Empty); 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 o["pre"] = fillJsonWithState(trueState); //convert all fields to hex
trueState.commit(); trueState.commit();
/// Trick
//merge into init state string our test predefined state and change difficulty for testing
//string genesisState = *(const_cast<string*>(&c_genesisInfoFrontier/*c_genesisInfoOlympic*/));
/*size_t pos = genesisState.find("alloc");
string sss = json_spirit::write_string(o["pre"], true);
sss.replace(0, 1, "");
sss.replace(sss.length() - 2, 2, ",");
genesisState.insert(pos + 9, sss);
genesisState.replace(genesisState.find("0x400000000"), 7, "0x20000");
note << genesisState;
*/
///
//Imported blocks from the start //Imported blocks from the start
std::vector<blockSet> blockSets; //Block(bytes) => UncleList(Blocks(bytes)) std::vector<blockSet> blockSets; //Block(bytes) => UncleList(Blocks(bytes))
@ -129,10 +146,8 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
TransientDirectory td_stateDB, td_bc; TransientDirectory td_stateDB, td_bc;
FullBlockChain<Ethash> bc(rlpGenesisBlock.out(), AccountMap(), td_bc.path(), WithExisting::Kill); FullBlockChain<Ethash> bc(rlpGenesisBlock.out(), AccountMap(), td_bc.path(), WithExisting::Kill);
OverlayDB database (State::openDB(td_stateDB.path(), h256{}, WithExisting::Kill)); //OverlayDB database (State::openDB(td_stateDB.path(), h256{}, WithExisting::Kill));
State state(database, BaseState::Empty); State state = importer.m_statePre;
Block block(database, BaseState::Empty, biGenesisBlock.beneficiary());
state = importer.m_statePre;
state.commit(); state.commit();
//import previous blocks //import previous blocks
@ -186,9 +201,14 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
cnote << "error in importing uncle! This produces an invalid block (May be by purpose for testing)."; cnote << "error in importing uncle! This produces an invalid block (May be by purpose for testing).";
} }
} }
bc.sync(uncleBlockQueue, state.db(), 4); bc.sync(uncleBlockQueue, state.db(), 4);
block.commitToSeal(bc); //block.commitToSeal(bc);
//Block block(State::openDB(bc.genesisHash()), BaseState::Empty, biGenesisBlock.beneficiary());
Block block = bc.genesisBlock(State::openDB(bc.genesisHash())); //NOT CLEAR WHAT IT RETURNS IF bc INITIALIZED WITH CUSTOM GENESIS BLOCK
//Block block (State::openDB(biGenesisBlock.hash()));
//Block block(state.db(), BaseState::Empty);
//mine a new block on top of previously imported //mine a new block on top of previously imported
try try
{ {
@ -208,125 +228,126 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
} }
// blObj["rlp"] = toHex(state.blockData(), 2, HexPrefix::Add); blObj["rlp"] = toHex(block.blockData(), 2, HexPrefix::Add);
// //get valid transactions //get valid transactions
// Transactions txList; Transactions txList;
// for (auto const& txi: txs.topTransactions(std::numeric_limits<unsigned>::max())) for (auto const& txi: txs.topTransactions(std::numeric_limits<unsigned>::max()))
// txList.push_back(txi); txList.push_back(txi);
// blObj["transactions"] = writeTransactionsToJson(txList); blObj["transactions"] = writeTransactionsToJson(txList);
// BlockHeader current_BlockHeader = state.info(); BlockHeader current_BlockHeader = block.info();
// RLPStream uncleStream; RLPStream uncleStream;
// uncleStream.appendList(vBiUncles.size()); uncleStream.appendList(vBiUncles.size());
// for (unsigned i = 0; i < vBiUncles.size(); ++i) for (unsigned i = 0; i < vBiUncles.size(); ++i)
// { {
// RLPStream uncleRlp; RLPStream uncleRlp;
// vBiUncles[i].streamRLP(uncleRlp); vBiUncles[i].streamRLP(uncleRlp);
// uncleStream.appendRaw(uncleRlp.out()); uncleStream.appendRaw(uncleRlp.out());
// } }
// if (blObj.count("blockHeader")) if (blObj.count("blockHeader"))
// overwriteBlockHeader(current_BlockHeader, blObj); overwriteBlockHeader(current_BlockHeader, blObj, bc.info());
// if (blObj.count("blockHeader") && blObj["blockHeader"].get_obj().count("bruncle")) if (blObj.count("blockHeader") && blObj["blockHeader"].get_obj().count("bruncle"))
// current_BlockHeader.populateFromParent(vBiBlocks[vBiBlocks.size() -1]); current_BlockHeader.populateFromParent(vBiBlocks[vBiBlocks.size() -1]);
// if (vBiUncles.size()) if (vBiUncles.size())
// { {
// // update unclehash in case of invalid uncles // update unclehash in case of invalid uncles
// current_BlockHeader.setSha3Uncles(sha3(uncleStream.out())); current_BlockHeader.setSha3Uncles(sha3(uncleStream.out()));
// updatePoW(current_BlockHeader); updatePoW(current_BlockHeader);
// } }
// // write block header // write block header
// mObject oBlockHeader; mObject oBlockHeader;
// writeBlockHeaderToJson(oBlockHeader, current_BlockHeader); writeBlockHeaderToJson(oBlockHeader, current_BlockHeader);
// blObj["blockHeader"] = oBlockHeader; blObj["blockHeader"] = oBlockHeader;
// vBiBlocks.push_back(current_BlockHeader); vBiBlocks.push_back(current_BlockHeader);
// // compare blocks from state and from rlp // compare blocks from state and from rlp
// RLPStream txStream; RLPStream txStream;
// txStream.appendList(txList.size()); txStream.appendList(txList.size());
// for (unsigned i = 0; i < txList.size(); ++i) for (unsigned i = 0; i < txList.size(); ++i)
// { {
// RLPStream txrlp; RLPStream txrlp;
// txList[i].streamRLP(txrlp); txList[i].streamRLP(txrlp);
// txStream.appendRaw(txrlp.out()); txStream.appendRaw(txrlp.out());
// } }
// RLPStream block2 = createFullBlockFromHeader(current_BlockHeader, txStream.out(), uncleStream.out()); RLPStream block2 = createFullBlockFromHeader(current_BlockHeader, txStream.out(), uncleStream.out());
// blObj["rlp"] = toHex(block2.out(), 2, HexPrefix::Add); blObj["rlp"] = toHex(block2.out(), 2, HexPrefix::Add);
// if (sha3(RLP(state.blockData())[0].data()) != sha3(RLP(block2.out())[0].data())) if (sha3(RLP(block.blockData())[0].data()) != sha3(RLP(block2.out())[0].data()))
// { {
// cnote << "block header mismatch state.blockData() vs updated state.info()\n"; cnote << "block header mismatch block.blockData() vs updated block.info()\n";
// cerr << toHex(state.blockData()) << "vs" << toHex(block2.out()); cerr << toHex(RLP(block.blockData())[0].data()) << "vs" << toHex(RLP(block2.out())[0].data());
// } }
// if (sha3(RLP(state.blockData())[1].data()) != sha3(RLP(block2.out())[1].data())) if (sha3(RLP(block.blockData())[1].data()) != sha3(RLP(block2.out())[1].data()))
// cnote << "txs mismatch\n"; cnote << "txs mismatch\n";
// if (sha3(RLP(state.blockData())[2].data()) != sha3(RLP(block2.out())[2].data())) if (sha3(RLP(block.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(); cnote << "uncle list mismatch\n" << RLP(block.blockData())[2].data() << "\n" << RLP(block2.out())[2].data();
// try try
// { {
// state.sync(bc); block.sync(bc);
// bc.import(block2.out(), state.db()); bc.import(block2.out(), block.db());
// state.sync(bc); block.sync(bc);
// state.commit(); //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 //there we get new blockchain status in state which could have more difficulty than we have in trueState
// trueBc.sync(uncleBlockQueue, trueState.db(), 4); //attempt to import new block to the true blockchain
// trueBc.attemptImport(block2.out(), trueState.db()); trueBc.sync(uncleBlockQueue, trueState.db(), 4);
// trueState.sync(trueBc); trueBc.attemptImport(block2.out(), trueState.db());
//trueState.sync(trueBc);
// blockSet newBlock;
// newBlock.first = block2.out(); blockSet newBlock;
// newBlock.second = uncleBlockQueueList; newBlock.first = block2.out();
// if (importBlockNumber < blockSets.size()) newBlock.second = uncleBlockQueueList;
// { if (importBlockNumber < blockSets.size())
// //make new correct history of imported blocks {
// blockSets[importBlockNumber] = newBlock; //make new correct history of imported blocks
// for (size_t i = importBlockNumber + 1; i < blockSets.size(); i++) blockSets[importBlockNumber] = newBlock;
// blockSets.pop_back(); for (size_t i = importBlockNumber + 1; i < blockSets.size(); i++)
// } blockSets.pop_back();
// else }
// blockSets.push_back(newBlock); else
// } blockSets.push_back(newBlock);
// // if exception is thrown, RLP is invalid and no blockHeader, Transaction list, or Uncle list should be given }
// catch (...) // 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")); cnote << "block is invalid!\n";
// blObj.erase(blObj.find("uncleHeaders")); blObj.erase(blObj.find("blockHeader"));
// blObj.erase(blObj.find("transactions")); blObj.erase(blObj.find("uncleHeaders"));
// } blObj.erase(blObj.find("transactions"));
// blArray.push_back(blObj); }
// this_thread::sleep_for(chrono::seconds(1)); blArray.push_back(blObj);
this_thread::sleep_for(chrono::seconds(1));
} //for blocks } //for blocks
// if (o.count("expect") > 0) if (o.count("expect") > 0)
// { {
// AccountMaskMap expectStateMap; AccountMaskMap expectStateMap;
// State stateExpect(OverlayDB(), BaseState::Empty, biGenesisBlock.beneficiary()); State stateExpect(OverlayDB(), BaseState::Empty);
// ImportTest::importState(o["expect"].get_obj(), stateExpect, expectStateMap); ImportTest::importState(o["expect"].get_obj(), stateExpect, expectStateMap);
// ImportTest::checkExpectedState(stateExpect, trueState, expectStateMap, Options::get().checkState ? WhenError::Throw : WhenError::DontThrow); ImportTest::compareStates(stateExpect, trueState, expectStateMap, Options::get().checkState ? WhenError::Throw : WhenError::DontThrow);
// o.erase(o.find("expect")); o.erase(o.find("expect"));
// } }
// o["blocks"] = blArray; o["blocks"] = blArray;
// o["postState"] = fillJsonWithState(trueState); o["postState"] = fillJsonWithState(trueState);
// o["lastblockhash"] = toString(trueBc.info().hash()); o["lastblockhash"] = toString(trueBc.info().hash());
// //make all values hex in pre section //make all values hex in pre section
// State prestate(OverlayDB(), BaseState::Empty); State prestate(OverlayDB(), BaseState::Empty);
// ImportTest::importState(o["pre"].get_obj(), prestate); ImportTest::importState(o["pre"].get_obj(), prestate);
// o["pre"] = fillJsonWithState(prestate); o["pre"] = fillJsonWithState(prestate);
}//_fillin }//_fillin
else else
{ {

Write Preview
Loading…
Cancel
Save