mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Clean up FakeExtVM - move to state tests
This commit is contained in:
Christoph Jentzsch
parent
7f4fa9e2e1
commit
3d17d7b2f1
@ -60,8 +60,9 @@ void connectClients(Client& c1, Client& c2)
|
||||
namespace test
|
||||
{
|
||||
|
||||
ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller)
|
||||
ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller):m_TestObject(_o)
|
||||
{
|
||||
|
||||
importEnv(_o["env"].get_obj());
|
||||
importState(_o["pre"].get_obj(), m_statePre);
|
||||
importExec(_o["exec"].get_obj());
|
||||
@ -69,10 +70,12 @@ ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller)
|
||||
if (!isFiller)
|
||||
{
|
||||
importState(_o["post"].get_obj(), m_statePost);
|
||||
importCallCreates(_o["callcreates"].get_array());
|
||||
//importCallCreates(_o["callcreates"].get_array());
|
||||
importGas(_o);
|
||||
importOutput(_o);
|
||||
}
|
||||
// else
|
||||
// m_TestObject = &_o; // if Filler then change Test object to prepare for export
|
||||
}
|
||||
|
||||
void ImportTest::importEnv(json_spirit::mObject& _o)
|
||||
@ -90,11 +93,14 @@ void ImportTest::importEnv(json_spirit::mObject& _o)
|
||||
m_environment.currentBlock.difficulty = toInt(_o["currentDifficulty"]);
|
||||
m_environment.currentBlock.timestamp = toInt(_o["currentTimestamp"]);
|
||||
m_environment.currentBlock.coinbaseAddress = Address(_o["currentCoinbase"].get_str());
|
||||
|
||||
m_statePre.m_previousBlock = m_environment.previousBlock;
|
||||
m_statePre.m_currentBlock = m_environment.currentBlock;
|
||||
}
|
||||
|
||||
void ImportTest::importState(json_spirit::mObject& _o, State& _state)
|
||||
{
|
||||
for (auto const& i: _o)
|
||||
for (auto& i: _o)
|
||||
{
|
||||
json_spirit::mObject o = i.second.get_obj();
|
||||
|
||||
@ -104,12 +110,7 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
|
||||
assert(o.count("code") > 0);
|
||||
|
||||
Address address = Address(i.first);
|
||||
cout << "address: " << address.abridged() << endl;
|
||||
|
||||
_state.m_cache[address] = AddressState(toInt(o["nonce"]), toInt(o["balance"]), h256(), h256());
|
||||
|
||||
cout << "addressInUse: " << _state.addressInUse(address) << endl;
|
||||
cout << "balance: " << _state.balance(address) << endl;
|
||||
_state.m_cache[address] = AddressState(toInt(o["nonce"]), toInt(o["balance"]), EmptyTrie, h256());
|
||||
|
||||
for (auto const& j: o["storage"].get_obj())
|
||||
_state.setStorage(address, toInt(j.first), toInt(j.second));
|
||||
@ -127,6 +128,8 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
|
||||
code.push_back(toByte(j));
|
||||
}
|
||||
|
||||
i.second.get_obj()["code"] = "0x" + toHex(code); //preperation for export
|
||||
|
||||
_state.m_cache[address].setCode(bytesConstRef(&code));
|
||||
_state.ensureCached(address, true, true);
|
||||
}
|
||||
@ -141,7 +144,7 @@ void ImportTest::importExec(json_spirit::mObject& _o)
|
||||
assert(_o.count("data") > 0);
|
||||
assert(_o.count("gasPrice") > 0);
|
||||
assert(_o.count("gas") > 0);
|
||||
assert(_o.count("code") > 0);
|
||||
//assert(_o.count("code") > 0);
|
||||
|
||||
m_environment.myAddress = Address(_o["address"].get_str());
|
||||
m_environment.caller = Address(_o["caller"].get_str());
|
||||
@ -219,6 +222,56 @@ void ImportTest::importOutput(json_spirit::mObject& _o)
|
||||
output = fromHex(_o["out"].get_str());
|
||||
}
|
||||
|
||||
void ImportTest::exportTest(bytes _output, u256 _gas, State& _statePost)
|
||||
{
|
||||
// export gas
|
||||
m_TestObject["gas"] = toString(_gas);
|
||||
|
||||
// export output
|
||||
m_TestObject["out"] = "0x" + toHex(_output);
|
||||
|
||||
// export post state
|
||||
json_spirit::mObject postState;
|
||||
|
||||
std::map<Address, AddressState> genesis = genesisState();
|
||||
|
||||
for (auto const& a: _statePost.addresses())
|
||||
{
|
||||
if (genesis.count(a.first))
|
||||
continue;
|
||||
|
||||
json_spirit::mObject o;
|
||||
o["balance"] = toString(_statePost.balance(a.first));
|
||||
o["nonce"] = toString(_statePost.transactionsFrom(a.first));
|
||||
{
|
||||
json_spirit::mObject store;
|
||||
for (auto const& s: _statePost.storage(a.first))
|
||||
store["0x"+toHex(toCompactBigEndian(s.first))] = "0x"+toHex(toCompactBigEndian(s.second));
|
||||
o["storage"] = store;
|
||||
}
|
||||
o["code"] = "0x" + toHex(_statePost.code(a.first));
|
||||
|
||||
postState[toString(a.first)] = o;
|
||||
}
|
||||
m_TestObject["post"] = json_spirit::mValue(postState);
|
||||
|
||||
m_TestObject["exec"].get_obj()["code"] = "0x" + toHex(code);
|
||||
|
||||
// // export callcreates
|
||||
// m_TestObject["callcreates"] = exportCallCreates();
|
||||
|
||||
// for (int i = 0; i < (m_manifest.internal.size(); ++i)
|
||||
// {
|
||||
// Transaction t;
|
||||
// t.value = m_manifest.internal[i].value;
|
||||
// t.gas = ;
|
||||
// t.data = m_manifest.internal[i].input; ;
|
||||
// t.receiveAddress = m_manifest.internal[i].to;
|
||||
// t.type =
|
||||
|
||||
// }
|
||||
}
|
||||
|
||||
u256 toInt(json_spirit::mValue const& _v)
|
||||
{
|
||||
switch (_v.type())
|
||||
|
||||
10
TestHelper.h
10
TestHelper.h
@ -51,7 +51,7 @@ public:
|
||||
void importGas(json_spirit::mObject& _o);
|
||||
void importOutput(json_spirit::mObject& _o);
|
||||
|
||||
void exportTest();
|
||||
void exportTest(bytes _output, u256 _gas, State& _statePost);
|
||||
Manifest* getManifest(){ return &m_manifest;}
|
||||
|
||||
State m_statePre;
|
||||
@ -63,9 +63,13 @@ public:
|
||||
bytes output;
|
||||
Manifest m_manifest;
|
||||
|
||||
private:
|
||||
// needed for const refs
|
||||
bytes code;
|
||||
|
||||
private:
|
||||
json_spirit::mObject& m_TestObject;
|
||||
|
||||
// needed for const refs
|
||||
|
||||
bytes data;
|
||||
};
|
||||
|
||||
|
||||
156
state.cpp
156
state.cpp
@ -20,6 +20,8 @@
|
||||
* State test functions.
|
||||
*/
|
||||
|
||||
#define FILL_TESTS
|
||||
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include "JsonSpiritHeaders.h"
|
||||
@ -58,7 +60,13 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
|
||||
BOOST_REQUIRE(o.count("pre") > 0);
|
||||
BOOST_REQUIRE(o.count("exec") > 0);
|
||||
|
||||
ImportTest importer(o,false);
|
||||
ImportTest importer(o,_fillin);
|
||||
|
||||
if (_fillin)
|
||||
{
|
||||
importer.code = importer.m_statePre.code(importer.m_environment.myAddress);
|
||||
importer.m_environment.code = &importer.code;
|
||||
}
|
||||
|
||||
ExtVM evm(importer.m_statePre, importer.m_environment.myAddress,
|
||||
importer.m_environment.caller, importer.m_environment.origin,
|
||||
@ -83,71 +91,76 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
|
||||
//BOOST_ERROR("Failed VM Test with Exception: " << e.what());
|
||||
}
|
||||
|
||||
BOOST_REQUIRE(o.count("post") > 0);
|
||||
BOOST_REQUIRE(o.count("callcreates") > 0);
|
||||
BOOST_REQUIRE(o.count("out") > 0);
|
||||
BOOST_REQUIRE(o.count("gas") > 0);
|
||||
|
||||
|
||||
// check output
|
||||
|
||||
|
||||
//dev::test::FakeExtVM test;
|
||||
//test.importState(o["post"].get_obj());
|
||||
//test.importCallCreates(o["callcreates"].get_array());
|
||||
|
||||
int j = 0;
|
||||
if (o["out"].type() == array_type)
|
||||
for (auto const& d: o["out"].get_array())
|
||||
{
|
||||
BOOST_CHECK_MESSAGE(output[j] == toInt(d), "Output byte [" << j << "] different!");
|
||||
++j;
|
||||
}
|
||||
else if (o["out"].get_str().find("0x") == 0)
|
||||
BOOST_CHECK(output == fromHex(o["out"].get_str().substr(2)));
|
||||
if (_fillin)
|
||||
importer.exportTest(output, vm.gas(), evm.state());
|
||||
else
|
||||
BOOST_CHECK(output == fromHex(o["out"].get_str()));
|
||||
{
|
||||
BOOST_REQUIRE(o.count("post") > 0);
|
||||
//BOOST_REQUIRE(o.count("callcreates") > 0);
|
||||
BOOST_REQUIRE(o.count("out") > 0);
|
||||
BOOST_REQUIRE(o.count("gas") > 0);
|
||||
|
||||
cout << "gas check: " << importer.gas << " " << toInt(o["gas"]) << " " << vm.gas() << endl;
|
||||
BOOST_CHECK_EQUAL(toInt(o["gas"]), vm.gas());
|
||||
|
||||
// auto& expectedAddrs = test.addresses;
|
||||
// auto& resultAddrs = fev.addresses;
|
||||
// for (auto&& expectedPair : expectedAddrs)
|
||||
// {
|
||||
// auto& expectedAddr = expectedPair.first;
|
||||
// auto resultAddrIt = resultAddrs.find(expectedAddr);
|
||||
// if (resultAddrIt == resultAddrs.end())
|
||||
// BOOST_ERROR("Missing expected address " << expectedAddr);
|
||||
// else
|
||||
// {
|
||||
// auto& expectedState = expectedPair.second;
|
||||
// auto& resultState = resultAddrIt->second;
|
||||
// BOOST_CHECK_MESSAGE(std::get<0>(expectedState) == std::get<0>(resultState), expectedAddr << ": incorrect balance " << std::get<0>(resultState) << ", expected " << std::get<0>(expectedState));
|
||||
// BOOST_CHECK_MESSAGE(std::get<1>(expectedState) == std::get<1>(resultState), expectedAddr << ": incorrect txCount " << std::get<1>(resultState) << ", expected " << std::get<1>(expectedState));
|
||||
// BOOST_CHECK_MESSAGE(std::get<3>(expectedState) == std::get<3>(resultState), expectedAddr << ": incorrect code");
|
||||
// check output
|
||||
|
||||
// auto&& expectedStore = std::get<2>(expectedState);
|
||||
// auto&& resultStore = std::get<2>(resultState);
|
||||
int j = 0;
|
||||
if (o["out"].type() == array_type)
|
||||
for (auto const& d: o["out"].get_array())
|
||||
{
|
||||
BOOST_CHECK_MESSAGE(output[j] == toInt(d), "Output byte [" << j << "] different!");
|
||||
++j;
|
||||
}
|
||||
else if (o["out"].get_str().find("0x") == 0)
|
||||
BOOST_CHECK(output == fromHex(o["out"].get_str().substr(2)));
|
||||
else
|
||||
BOOST_CHECK(output == fromHex(o["out"].get_str()));
|
||||
|
||||
// for (auto&& expectedStorePair : expectedStore)
|
||||
// {
|
||||
// auto& expectedStoreKey = expectedStorePair.first;
|
||||
// auto resultStoreIt = resultStore.find(expectedStoreKey);
|
||||
// if (resultStoreIt == resultStore.end())
|
||||
// BOOST_ERROR(expectedAddr << ": missing store key " << expectedStoreKey);
|
||||
// else
|
||||
// {
|
||||
// auto& expectedStoreValue = expectedStorePair.second;
|
||||
// auto& resultStoreValue = resultStoreIt->second;
|
||||
// BOOST_CHECK_MESSAGE(expectedStoreValue == resultStoreValue, expectedAddr << ": store[" << expectedStoreKey << "] = " << resultStoreValue << ", expected " << expectedStoreValue);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
BOOST_CHECK_EQUAL(toInt(o["gas"]), vm.gas());
|
||||
|
||||
BOOST_CHECK(evm.state().addresses() == importer.m_statePost.addresses()); // Just to make sure nothing missed
|
||||
//BOOST_CHECK(evm.callcreates == importer.callcreates);
|
||||
auto expectedAddrs = importer.m_statePost.addresses();
|
||||
auto resultAddrs = evm.state().addresses();
|
||||
for (auto& expectedPair : expectedAddrs)
|
||||
{
|
||||
auto& expectedAddr = expectedPair.first;
|
||||
auto resultAddrIt = resultAddrs.find(expectedAddr);
|
||||
if (resultAddrIt == resultAddrs.end())
|
||||
BOOST_ERROR("Missing expected address " << expectedAddr);
|
||||
else
|
||||
{
|
||||
BOOST_CHECK_MESSAGE(importer.m_statePost.balance(expectedAddr) == evm.state().balance(expectedAddr), expectedAddr << ": incorrect balance " << evm.state().balance(expectedAddr) << ", expected " << importer.m_statePost.balance(expectedAddr));
|
||||
BOOST_CHECK_MESSAGE(importer.m_statePost.transactionsFrom(expectedAddr) == evm.state().transactionsFrom(expectedAddr), expectedAddr << ": incorrect txCount " << evm.state().transactionsFrom(expectedAddr) << ", expected " << importer.m_statePost.transactionsFrom(expectedAddr));
|
||||
BOOST_CHECK_MESSAGE(importer.m_statePost.code(expectedAddr) == evm.state().code(expectedAddr), expectedAddr << ": incorrect code");
|
||||
|
||||
auto&& expectedStore = importer.m_statePost.storage(expectedAddr);
|
||||
auto&& resultStore = evm.state().storage(expectedAddr);
|
||||
|
||||
for (auto&& expectedStorePair : expectedStore)
|
||||
{
|
||||
auto& expectedStoreKey = expectedStorePair.first;
|
||||
auto resultStoreIt = resultStore.find(expectedStoreKey);
|
||||
if (resultStoreIt == resultStore.end())
|
||||
BOOST_ERROR(expectedAddr << ": missing store key " << expectedStoreKey);
|
||||
else
|
||||
{
|
||||
auto& expectedStoreValue = expectedStorePair.second;
|
||||
auto& resultStoreValue = resultStoreIt->second;
|
||||
BOOST_CHECK_MESSAGE(expectedStoreValue == resultStoreValue, expectedAddr << ": store[" << expectedStoreKey << "] = " << resultStoreValue << ", expected " << expectedStoreValue);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (auto& resultPair : resultAddrs)
|
||||
{
|
||||
auto& resultAddr = resultPair.first;
|
||||
auto expectedAddrIt = expectedAddrs.find(resultAddr);
|
||||
if (expectedAddrIt == expectedAddrs.end())
|
||||
BOOST_ERROR("Missing result address " << resultAddr);
|
||||
}
|
||||
|
||||
BOOST_CHECK(evm.state().addresses() == importer.m_statePost.addresses()); // Just to make sure nothing missed
|
||||
//BOOST_CHECK(evm.callcreates == importer.callcreates);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -166,7 +179,7 @@ void executeStateTests(const string& _name)
|
||||
else
|
||||
testPath = ptestPath;
|
||||
|
||||
testPath += "/vmtests";
|
||||
testPath += "/statetests";
|
||||
|
||||
#ifdef FILL_TESTS
|
||||
try
|
||||
@ -176,9 +189,9 @@ void executeStateTests(const string& _name)
|
||||
boost::filesystem::path p(__FILE__);
|
||||
boost::filesystem::path dir = p.parent_path();
|
||||
string s = asString(dev::contents(dir.string() + "/" + _name + "Filler.json"));
|
||||
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + _name + "Filler.json is empty.");
|
||||
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + dir.string() + "/" + _name + "Filler.json is empty.");
|
||||
json_spirit::read_string(s, v);
|
||||
dev::test::doStateTests(v, true);
|
||||
doStateTests(v, true);
|
||||
writeFile(testPath + "/" + _name + ".json", asBytes(json_spirit::write_string(v, true)));
|
||||
}
|
||||
catch (Exception const& _e)
|
||||
@ -212,22 +225,17 @@ void executeStateTests(const string& _name)
|
||||
}
|
||||
} } }// Namespace Close
|
||||
|
||||
|
||||
BOOST_AUTO_TEST_CASE(vmSystemOperationsTest)
|
||||
{
|
||||
dev::eth::test::executeStateTests("stSystemOperationsTest");
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(tmp)
|
||||
{
|
||||
std::cout << "Doing systemoperationsTest in state\n";
|
||||
int currentVerbosity = g_logVerbosity;
|
||||
g_logVerbosity = 12;
|
||||
dev::eth::test::executeStateTests("vmSystemOperationsTest");
|
||||
dev::eth::test::executeStateTests("tmp");
|
||||
g_logVerbosity = currentVerbosity;
|
||||
}
|
||||
|
||||
//BOOST_AUTO_TEST_CASE(tmp)
|
||||
//{
|
||||
// std::cout << "Doing systemoperationsTest in state\n";
|
||||
// int currentVerbosity = g_logVerbosity;
|
||||
// g_logVerbosity = 12;
|
||||
// dev::eth::test::executeStateTests("tmp");
|
||||
// g_logVerbosity = currentVerbosity;
|
||||
//}
|
||||
|
||||
|
||||
37
tmpFiller.json
Normal file
37
tmpFiller.json
Normal file
@ -0,0 +1,37 @@
|
||||
{
|
||||
"ABAcallsSuicide0": {
|
||||
"env" : {
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||
"currentNumber" : "0",
|
||||
"currentGasLimit" : "10000000",
|
||||
"currentDifficulty" : "256",
|
||||
"currentTimestamp" : 1,
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"nonce" : 0,
|
||||
"code" : "{ [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }",
|
||||
"storage": {}
|
||||
},
|
||||
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
|
||||
"balance" : "23",
|
||||
"code" : "{ [[ (PC) ]] (ADD 1 (CALL 500 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 23 0 0 0 0)) } ",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "100000",
|
||||
"data" : "",
|
||||
"gasPrice" : "100000000000000",
|
||||
"gas" : "10000000000000"
|
||||
}
|
||||
}
|
||||
}
|
||||
192
vm.cpp
192
vm.cpp
@ -43,20 +43,6 @@ h160 FakeExtVM::create(u256 _endowment, u256* _gas, bytesConstRef _init, OnOpFun
|
||||
t.gasPrice = gasPrice;
|
||||
t.gas = *_gas;
|
||||
t.data = _init.toBytes();
|
||||
|
||||
// m_s.noteSending(myAddress);
|
||||
// m_ms.internal.resize(m_ms.internal.size() + 1);
|
||||
// auto ret = m_s.create(myAddress, _endowment, gasPrice, _gas, _init, origin, &sub, &m_ms ? &(m_ms.internal.back()) : nullptr, {}, 1);
|
||||
// if (!m_ms.internal.back().from)
|
||||
// m_ms.internal.pop_back();
|
||||
|
||||
// if (get<0>(addresses[myAddress]) >= _endowment)
|
||||
// {
|
||||
// get<1>(addresses[myAddress])++;
|
||||
// get<0>(addresses[ret]) = _endowment;
|
||||
// //get<3>(addresses[ret]) = m_s.code(ret);
|
||||
// }
|
||||
|
||||
t.type = eth::Transaction::ContractCreation;
|
||||
callcreates.push_back(t);
|
||||
return na;
|
||||
@ -64,8 +50,6 @@ h160 FakeExtVM::create(u256 _endowment, u256* _gas, bytesConstRef _init, OnOpFun
|
||||
|
||||
bool FakeExtVM::call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, OnOpFunc const&, Address _myAddressOverride, Address _codeAddressOverride)
|
||||
{
|
||||
// u256 contractgas = 0xffff;
|
||||
|
||||
Transaction t;
|
||||
t.value = _value;
|
||||
t.gasPrice = gasPrice;
|
||||
@ -76,101 +60,6 @@ bool FakeExtVM::call(Address _receiveAddress, u256 _value, bytesConstRef _data,
|
||||
callcreates.push_back(t);
|
||||
(void)_out;
|
||||
return true;
|
||||
|
||||
// string codeOf_CodeAddress = _codeAddressOverride ? toHex(get<3>(addresses[_codeAddressOverride])) : toHex(get<3>(addresses[_receiveAddress]) );
|
||||
// string sizeOfCode = toHex(toCompactBigEndian((codeOf_CodeAddress.size()+1)/2));
|
||||
|
||||
// string codeOf_SenderAddress = toHex(get<3>(addresses[myAddress]) );
|
||||
// string sizeOfSenderCode = toHex(toCompactBigEndian((codeOf_SenderAddress.size()+1)/2));
|
||||
|
||||
// if (codeOf_SenderAddress.size())
|
||||
// {
|
||||
// // create init code that returns given contract code
|
||||
// string initStringHex = "{ (CODECOPY 0 (- (CODESIZE) 0x" + sizeOfSenderCode + " ) 0x" + sizeOfSenderCode + ") (RETURN 0 0x" + sizeOfSenderCode +")}";
|
||||
// bytes initBytes = compileLLL(initStringHex, true, NULL);
|
||||
// initBytes += fromHex(codeOf_SenderAddress);
|
||||
// bytesConstRef init(&initBytes);
|
||||
|
||||
// if (!m_s.addresses().count(myAddress))
|
||||
// {
|
||||
// m_ms.internal.resize(m_ms.internal.size() + 1);
|
||||
// auto na = m_s.createNewAddress(myAddress, myAddress, balance(myAddress), gasPrice, &contractgas, init, origin, &sub, &m_ms ? &(m_ms.internal.back()) : nullptr, {}, 1);
|
||||
// if (!m_ms.internal.back().from)
|
||||
// m_ms.internal.pop_back();
|
||||
// if (na != myAddress)
|
||||
// {
|
||||
// cnote << "not able to call to : " << myAddress << "\n";
|
||||
// cnote << "in FakeExtVM you can only make a call to " << na << "\n";
|
||||
// BOOST_THROW_EXCEPTION(FakeExtVMFailure() << errinfo_comment("Address not callable in FakeExtVM\n") << errinfo_wrongAddress(toString(myAddress)));
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// if (codeOf_CodeAddress.size())
|
||||
// {
|
||||
// // create init code that returns given contract code
|
||||
// string initStringHex = "{ (CODECOPY 0 (- (CODESIZE) 0x" + sizeOfCode + " ) 0x" + sizeOfCode + ") (RETURN 0 0x" + sizeOfCode +")}";
|
||||
// bytes initBytes = compileLLL(initStringHex, true, NULL);
|
||||
// initBytes += fromHex(codeOf_CodeAddress);
|
||||
// bytesConstRef init(&initBytes);
|
||||
|
||||
// if (!m_s.addresses().count(_codeAddressOverride ? _codeAddressOverride : _receiveAddress))
|
||||
// {
|
||||
// m_s.noteSending(myAddress);
|
||||
// m_ms.internal.resize(m_ms.internal.size() + 1);
|
||||
// auto na = m_s.createNewAddress(_codeAddressOverride ? _codeAddressOverride : _receiveAddress, myAddress, balance(_codeAddressOverride ? _codeAddressOverride : _receiveAddress), gasPrice, &contractgas, init, origin, &sub, &m_ms ? &(m_ms.internal.back()) : nullptr, OnOpFunc(), 1);
|
||||
// if (!m_ms.internal.back().from)
|
||||
// m_ms.internal.pop_back();
|
||||
|
||||
// if (na != (_codeAddressOverride ? _codeAddressOverride : _receiveAddress))
|
||||
// {
|
||||
// cnote << "not able to call to : " << (_codeAddressOverride ? _codeAddressOverride : _receiveAddress) << "\n";
|
||||
// cnote << "in FakeExtVM you can only make a call to " << na << "\n";
|
||||
// BOOST_THROW_EXCEPTION(FakeExtVMFailure() << errinfo_comment("Address not callable in FakeExtVM\n") << errinfo_wrongAddress(toString(_codeAddressOverride ? _codeAddressOverride : _receiveAddress)));
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
|
||||
// m_ms.internal.resize(m_ms.internal.size() + 1);
|
||||
|
||||
// auto ret = m_s.call(_receiveAddress,_codeAddressOverride ? _codeAddressOverride : _receiveAddress, _myAddressOverride ? _myAddressOverride : myAddress, _value, gasPrice, _data, _gas, _out, origin, &sub, &(m_ms.internal.back()), Executive::simpleTrace(), 1);
|
||||
|
||||
// if (!m_ms.internal.back().from)
|
||||
// m_ms.internal.pop_back();
|
||||
|
||||
// // get correct balances, (also for sucicides in the call function)
|
||||
// for (auto const& f: addresses)
|
||||
// {
|
||||
// if (m_s.addressInUse(f.first))
|
||||
// get<0>(addresses[f.first]) = m_s.balance(f.first);
|
||||
// }
|
||||
|
||||
// if (!ret)
|
||||
// return false;
|
||||
|
||||
// // TODO: @CJentzsch refund SSTORE stuff.
|
||||
// // TODO: @CJentzsch test logs.
|
||||
|
||||
// // do suicides
|
||||
// for (auto const& f: sub.suicides)
|
||||
// addresses.erase(f);
|
||||
|
||||
// // get storage
|
||||
// if ((get<0>(addresses[myAddress]) >= _value) && (sub.suicides.find(_receiveAddress) == sub.suicides.end()))
|
||||
// {
|
||||
// for (auto const& j: m_s.storage(_receiveAddress))
|
||||
// {
|
||||
// u256 adr(j.first);
|
||||
// if ((j.second != 0) )
|
||||
// get<2>(addresses[_receiveAddress])[adr] = j.second;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// addresses.erase(_receiveAddress); // for the sake of comparison
|
||||
|
||||
// return true;
|
||||
}
|
||||
|
||||
void FakeExtVM::setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data)
|
||||
@ -363,9 +252,9 @@ void FakeExtVM::importExec(mObject& _o)
|
||||
code = &thisTxCode;
|
||||
if (_o["code"].type() == str_type)
|
||||
if (_o["code"].get_str().find_first_of("0x") == 0)
|
||||
thisTxCode = fromHex(_o["code"].get_str().substr(2));
|
||||
else
|
||||
thisTxCode = compileLLL(_o["code"].get_str());
|
||||
else
|
||||
thisTxCode = fromHex(_o["code"].get_str().substr(2));
|
||||
else if (_o["code"].type() == array_type)
|
||||
for (auto const& j: _o["code"].get_array())
|
||||
thisTxCode.push_back(toByte(j));
|
||||
@ -439,9 +328,6 @@ eth::OnOpFunc FakeExtVM::simpleTrace()
|
||||
o << " MEMORY" << std::endl << memDump(vm.memory());
|
||||
o << " STORAGE" << std::endl;
|
||||
|
||||
// for (auto const& i: ext.state().storage(ext.myAddress))
|
||||
// o << std::showbase << std::hex << i.first << ": " << i.second << std::endl;
|
||||
|
||||
for (auto const& i: std::get<2>(ext.addresses.find(ext.myAddress)->second))
|
||||
o << std::showbase << std::hex << i.first << ": " << i.second << std::endl;
|
||||
|
||||
@ -458,71 +344,6 @@ eth::OnOpFunc FakeExtVM::simpleTrace()
|
||||
};
|
||||
}
|
||||
|
||||
//// THIS IS BROKEN AND NEEDS TO BE REMOVED.
|
||||
//h160 FakeState::createNewAddress(Address _newAddress, Address _sender, u256 _endowment, u256 _gasPrice, u256* _gas, bytesConstRef _code, Address _origin, SubState* o_sub, Manifest* o_ms, OnOpFunc const& _onOp, unsigned _level)
|
||||
//{
|
||||
// (void)o_sub;
|
||||
|
||||
// if (!_origin)
|
||||
// _origin = _sender;
|
||||
|
||||
// if (o_ms)
|
||||
// {
|
||||
// o_ms->from = _sender;
|
||||
// o_ms->to = Address();
|
||||
// o_ms->value = _endowment;
|
||||
// o_ms->input = _code.toBytes();
|
||||
// }
|
||||
|
||||
// // Set up new account...
|
||||
// m_cache[_newAddress] = AddressState(0, balance(_newAddress) + _endowment, h256(), h256());
|
||||
|
||||
// // Execute init code.
|
||||
// VM vm(*_gas);
|
||||
// ExtVM evm(*this, _newAddress, _sender, _origin, _endowment, _gasPrice, bytesConstRef(), _code, o_ms, _level);
|
||||
// bool revert = false;
|
||||
// bytesConstRef out;
|
||||
|
||||
// try
|
||||
// {
|
||||
// out = vm.go(evm, _onOp);
|
||||
// if (o_ms)
|
||||
// o_ms->output = out.toBytes();
|
||||
// // TODO: deal with evm.sub
|
||||
// }
|
||||
// catch (OutOfGas const& /*_e*/)
|
||||
// {
|
||||
// clog(StateChat) << "Out of Gas! Reverting.";
|
||||
// revert = true;
|
||||
// }
|
||||
// catch (VMException const& _e)
|
||||
// {
|
||||
// clog(StateChat) << "VM Exception: " << diagnostic_information(_e);
|
||||
// }
|
||||
// catch (Exception const& _e)
|
||||
// {
|
||||
// clog(StateChat) << "Exception in VM: " << diagnostic_information(_e);
|
||||
// }
|
||||
// catch (std::exception const& _e)
|
||||
// {
|
||||
// clog(StateChat) << "std::exception in VM: " << _e.what();
|
||||
// }
|
||||
|
||||
// // TODO: CHECK: IS THIS CORRECT?! (esp. given account created prior to revertion init.)
|
||||
|
||||
// // Write state out only in the case of a non-out-of-gas transaction.
|
||||
// if (revert)
|
||||
// evm.revert();
|
||||
|
||||
// // Set code.
|
||||
// if (addressInUse(_newAddress))
|
||||
// m_cache[_newAddress].setCode(out);
|
||||
|
||||
// *_gas = vm.gas();
|
||||
|
||||
// return _newAddress;
|
||||
//}
|
||||
|
||||
namespace dev { namespace test {
|
||||
|
||||
void doTests(json_spirit::mValue& v, bool _fillin)
|
||||
@ -758,14 +579,13 @@ BOOST_AUTO_TEST_CASE(vmPushDupSwapTest)
|
||||
dev::test::executeTests("vmPushDupSwapTest");
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(vmSystemOperationsTest)
|
||||
{
|
||||
dev::test::executeTests("vmSystemOperationsTest");
|
||||
}
|
||||
//BOOST_AUTO_TEST_CASE(vmSystemOperationsTest)
|
||||
//{
|
||||
// dev::test::executeTests("vmSystemOperationsTest");
|
||||
//}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(userDefinedFile)
|
||||
{
|
||||
|
||||
if (boost::unit_test::framework::master_test_suite().argc == 2)
|
||||
{
|
||||
string filename = boost::unit_test::framework::master_test_suite().argv[1];
|
||||
|
||||
9
vm.h
9
vm.h
@ -41,13 +41,6 @@ namespace dev { namespace test {
|
||||
|
||||
struct FakeExtVMFailure : virtual Exception {};
|
||||
|
||||
//class FakeState: public eth::State
|
||||
//{
|
||||
//public:
|
||||
// /// Execute a contract-creation transaction.
|
||||
// h160 createNewAddress(Address _newAddress, Address _txSender, u256 _endowment, u256 _gasPrice, u256* _gas, bytesConstRef _code, Address _originAddress = {}, eth::SubState* o_sub = nullptr, eth::Manifest* o_ms = nullptr, eth::OnOpFunc const& _onOp = {}, unsigned _level = 0);
|
||||
//};
|
||||
|
||||
class FakeExtVM: public eth::ExtVMFace
|
||||
{
|
||||
public:
|
||||
@ -82,7 +75,6 @@ public:
|
||||
void importCallCreates(json_spirit::mArray& _callcreates);
|
||||
|
||||
eth::OnOpFunc simpleTrace();
|
||||
//FakeState state() const { return m_s; }
|
||||
|
||||
std::map<Address, std::tuple<u256, u256, std::map<u256, u256>, bytes>> addresses;
|
||||
eth::Transactions callcreates;
|
||||
@ -91,7 +83,6 @@ public:
|
||||
u256 gas;
|
||||
|
||||
private:
|
||||
//FakeState m_s;
|
||||
eth::Manifest m_ms;
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user