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

Merge branch 'develop' of github.com:ethereum/cpp-ethereum into new-rpc

cl-refactor
KKudryavtsev 11 years ago
parent
6ba89491fe eafa489d79
commit
27bedb9677
10 changed files with 400 additions and 254 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. 2
      README.md
  2. 25
      libethereum/BlockInfo.h
  3. 1
      libethereum/Instruction.h
  4. 6
      neth/CMakeLists.txt
  5. 121
      neth/main.cpp
  6. 3
      test/fork.cpp
  7. 3
      test/network.cpp
  8. 3
      test/txTest.cpp
  9. 381
      test/vm.cpp
  10. 109
      test/vmtests.json

2
README.md
View File

@ -8,7 +8,7 @@ Contributors, builders and testers include Eric Lombrozo (cross-compilation), Ti
### Building
See [Build Instructions](https://github.com/ethereum/cpp-ethereum/wiki/Build-Instructions) and [Compatibility Info and Build Tips](https://github.com/ethereum/cpp-ethereum/wiki/Compatibility-Info-and-Build-Tips).
See the [Wiki](https://github.com/ethereum/cpp-ethereum/wiki) for build instructions, compatibility information and build tips.
### Testing

25
libethereum/BlockInfo.h
View File

@ -27,10 +27,31 @@
namespace eth
{
/** @brief Encapsulation of a block header.
* Class to contain all of a block header's data. It is able to parse a block header and populate
* from some given RLP block serialisation with the static fromHeader(), through the method
* populateFromHeader(). This will conduct a minimal level of verification. In this case extra
* verification can be performed through verifyInternals() and verifyParent().
*
* The object may also be populated from an entire block through the explicit
* constructor BlockInfo(bytesConstRef) and manually with the populate() method. These will
* conduct verification of the header against the other information in the block.
*
* The object may be populated with a template given a parent BlockInfo object with the
* populateFromParent() method. The genesis block info may be retrieved with genesis() and the
* corresponding RLP block created with createGenesisBlock().
*
* The difficulty and gas-limit derivations may be calculated with the calculateDifficulty()
* and calculateGasLimit() and the object serialised to RLP with fillStream. To determine the
* header hash without the nonce (for mining), the method headerHashWithoutNonce() is provided.
*
* The defualt constructor creates an empty object, which can be tested against with the boolean
* conversion operator.
*/
struct BlockInfo
{
public:
h256 hash; ///< SHA3 hash of the entire block!
h256 hash; ///< SHA3 hash of the entire block! Not serialised (the only member not contained in a block header).
h256 parentHash;
h256 sha3Uncles;
Address coinbaseAddress;
@ -70,7 +91,6 @@ public:
}
bool operator!=(BlockInfo const& _cmp) const { return !operator==(_cmp); }
static BlockInfo const& genesis() { if (!s_genesis) (s_genesis = new BlockInfo)->populateGenesis(); return *s_genesis; }
void populateFromHeader(RLP const& _header, bool _checkNonce = true);
void populate(bytesConstRef _block, bool _checkNonce = true);
void verifyInternals(bytesConstRef _block) const;
@ -84,6 +104,7 @@ public:
h256 headerHashWithoutNonce() const;
void fillStream(RLPStream& _s, bool _nonce) const;
static BlockInfo const& genesis() { if (!s_genesis) (s_genesis = new BlockInfo)->populateGenesis(); return *s_genesis; }
static bytes createGenesisBlock();
private:

1
libethereum/Instruction.h
View File

@ -151,6 +151,7 @@ std::string disassemble(bytes const& _mem);
/// Compile a Low-level Lisp-like Language program into EVM-code.
bytes compileLisp(std::string const& _code, bool _quiet, bytes& _init);
/// Append an appropriate PUSH instruction together with the literal value onto the given code.
unsigned pushLiteral(bytes& o_code, u256 _literalValue);
}

6
neth/CMakeLists.txt
View File

@ -11,6 +11,12 @@ set(EXECUTABLE neth)
add_executable(${EXECUTABLE} ${SRC_LIST})
if (JSONRPC_LS)
add_definitions(-DETH_JSONRPC)
include_directories(${JSONRPC_ID})
target_link_libraries(${EXECUTABLE} ${JSONRPC_LS})
endif ()
if (${TARGET_PLATFORM} STREQUAL "w64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
target_link_libraries(${EXECUTABLE} gcc)

121
neth/main.cpp
View File

@ -33,6 +33,13 @@
#include <libethereum/BlockChain.h>
#include <libethereum/State.h>
#include <libethereum/Instruction.h>
#if ETH_JSONRPC
#include <eth/EthStubServer.h>
#include <eth/EthStubServer.cpp>
#include <eth/abstractethstubserver.h>
#include <eth/CommonJS.h>
#include <eth/CommonJS.cpp>
#endif
#include "BuildInfo.h"
#undef KEY_EVENT // from windows.h
@ -67,6 +74,10 @@ void help()
<< " -d,--db-path <path> Load database from path (default: ~/.ethereum " << endl
<< " <APPDATA>/Etherum or Library/Application Support/Ethereum)." << endl
<< " -h,--help Show this help message and exit." << endl
#if ETH_JSONRPC
<< " -j,--json-rpc Enable JSON-RPC server (default: off)." << endl
<< " --json-rpc-port Specify JSON-RPC server port (implies '-j', default: 8080)." << endl
#endif
<< " -l,--listen <port> Listen on the given port for incoming connected (default: 30303)." << endl
<< " -m,--mining <on/off> Enable mining (default: off)" << endl
<< " -n,--upnp <on/off> Use upnp for NAT (default: on)." << endl
@ -87,6 +98,10 @@ void interactiveHelp()
<< "Commands:" << endl
<< " netstart <port> Starts the network sybsystem on a specific port." << endl
<< " netstop Stops the network subsystem." << endl
#if ETH_JSONRPC
<< " jsonstart <port> Starts the JSON-RPC server." << endl
<< " jsonstop Stops the JSON-RPC server." << endl
#endif
<< " connect <addr> <port> Connects to a specific peer." << endl
<< " minestart Starts mining." << endl
<< " minestop Stops mining." << endl
@ -133,7 +148,7 @@ void version()
}
u256 c_minGasPrice = 10000000000000;
u256 c_minGas = 100;
u256 c_minGas = 500;
Address c_config = Address("5620133321fcac7f15a5c570016f6cb6dc263f9d");
string pretty(h160 _a, eth::State _st)
{
@ -293,6 +308,9 @@ int main(int argc, char** argv)
bool mining = false;
NodeMode mode = NodeMode::Full;
unsigned peers = 5;
#if ETH_JSONRPC
int jsonrpc = 8080;
#endif
string publicIP;
bool upnp = true;
string clientName;
@ -363,6 +381,12 @@ int main(int argc, char** argv)
cerr << "Unknown mining option: " << m << endl;
}
}
#if ETH_JSONRPC
else if ((arg == "-j" || arg == "--json-rpc"))
jsonrpc = jsonrpc ? jsonrpc : 8080;
else if (arg == "--json-rpc-port" && i + 1 < argc)
jsonrpc = atoi(argv[++i]);
#endif
else if ((arg == "-v" || arg == "--verbosity") && i + 1 < argc)
g_logVerbosity = atoi(argv[++i]);
else if ((arg == "-x" || arg == "--peers") && i + 1 < argc)
@ -462,6 +486,16 @@ int main(int argc, char** argv)
c.unlock();
}
#if ETH_JSONRPC
auto_ptr<EthStubServer> jsonrpcServer;
if (jsonrpc > -1)
{
jsonrpcServer = auto_ptr<EthStubServer>(new EthStubServer(new jsonrpc::HttpServer(jsonrpc), c));
jsonrpcServer->setKeys({us});
jsonrpcServer->StartListening();
}
#endif
while (true)
{
wclrtobot(consolewin);
@ -534,6 +568,28 @@ int main(int argc, char** argv)
c.stopMining();
c.unlock();
}
#if ETH_JSONRPC
else if (cmd == "jsonport")
{
if (iss.peek() != -1)
iss >> jsonrpc;
cout << "JSONRPC Port: " << jsonrpc << endl;
}
else if (cmd == "jsonstart")
{
if (jsonrpc < 0)
jsonrpc = 8080;
jsonrpcServer = auto_ptr<EthStubServer>(new EthStubServer(new jsonrpc::HttpServer(jsonrpc), c));
jsonrpcServer->setKeys({us});
jsonrpcServer->StartListening();
}
else if (cmd == "jsonstop")
{
if (jsonrpcServer.get())
jsonrpcServer->StopListening();
jsonrpcServer.reset();
}
#endif
else if (cmd == "address")
{
ccout << "Current address:" << endl;
@ -613,6 +669,9 @@ int main(int argc, char** argv)
ssbd << bbd;
cnote << ssbd.str();
int ssize = fields[4].length();
c.lock();
c_minGas = (u256)c.state().callGas(data.size(), 0);
c.unlock();
if (size < 40)
{
if (size > 0)
@ -671,9 +730,11 @@ int main(int argc, char** argv)
else
{
u256 gasPrice = c_minGasPrice;
u256 gas = c_minGas;
c.lock();
c_minGas = (u256)c.state().callGas(0, 0);
c.unlock();
Address dest = h160(fromHex(fields[0]));
c.transact(us.secret(), amount, dest, bytes(), gas, gasPrice);
c.transact(us.secret(), amount, dest, bytes(), c_minGas, gasPrice);
}
}
}
@ -686,12 +747,11 @@ int main(int argc, char** argv)
l.push_back("Gas");
vector<string> b;
b.push_back("Code (hex)");
b.push_back("Init (hex)");
c.lock();
vector<string> fields = form_dialog(s, l, b, height, width, cmd);
c.unlock();
int fs = fields.size();
if (fs < 5)
if (fs < 4)
{
if (fs > 0)
cwarn << "Missing parameter";
@ -710,6 +770,28 @@ int main(int argc, char** argv)
stringstream ssp;
ssp << fields[1];
ssp >> gasPrice;
string sinit = fields[3];
trim_all(sinit);
int size = sinit.length();
bytes init;
cnote << "Init:";
cnote << sinit;
cnote << "Code size: " << size;
if (size < 1)
cwarn << "No code submitted";
else
{
cnote << "Assembled:";
stringstream ssc;
init = fromHex(sinit);
ssc.str(string());
ssc << disassemble(init);
cnote << "Init:";
cnote << ssc.str();
}
c.lock();
c_minGas = (u256)c.state().createGas(init.size(), 0);
c.unlock();
if (endowment < 0)
cwarn << "Invalid endowment";
else if (gasPrice < c_minGasPrice)
@ -718,29 +800,7 @@ int main(int argc, char** argv)
cwarn << "Minimum gas amount is " << c_minGas;
else
{
string scode = fields[3];
trim_all(scode);
string sinit = fields[4];
trim_all(sinit);
int size = scode.length();
cnote << "Code:";
cnote << scode;
cnote << "Init:";
cnote << sinit;
cnote << "Code size: " << size;
if (size < 1)
cwarn << "No code submitted";
else
{
cnote << "Assembled:";
stringstream ssc;
bytes init = fromHex(sinit);
ssc.str(string());
ssc << disassemble(init);
cnote << "Init:";
cnote << ssc.str();
c.transact(us.secret(), endowment, init, gas, gasPrice);
}
c.transact(us.secret(), endowment, init, gas, gasPrice);
}
}
}
@ -933,6 +993,11 @@ int main(int argc, char** argv)
endwin();
refresh();
#if ETH_JSONRPC
if (jsonrpcServer.get())
jsonrpcServer->StopListening();
#endif
return 0;
}

3
test/fork.cpp
View File

@ -29,6 +29,8 @@
using namespace std;
using namespace eth;
// Disabled since tests shouldn't block. Need a short cut to avoid real mining.
/*
BOOST_AUTO_TEST_CASE(simple_chain_fork)
{
//start a client and mine a short chain
@ -54,3 +56,4 @@ BOOST_AUTO_TEST_CASE(simple_chain_fork)
BOOST_REQUIRE(c1.state().balance(c1.address()) == 0);
BOOST_REQUIRE(c2.state().balance(c2.address()) > 0);
}
*/

3
test/network.cpp
View File

@ -29,6 +29,8 @@
using namespace std;
using namespace eth;
// Disabled since tests shouldn't block (not the worst offender, but timeout should be reduced anyway).
/*
BOOST_AUTO_TEST_CASE(listen_port_busy)
{
short port = 20000;
@ -49,3 +51,4 @@ BOOST_AUTO_TEST_CASE(listen_port_busy)
BOOST_REQUIRE(c1.peerServer()->listenPort() != 0);
BOOST_REQUIRE(c1.peerServer()->listenPort() != port);
}
*/

3
test/txTest.cpp
View File

@ -29,6 +29,8 @@
using namespace std;
using namespace eth;
// Disabled since tests shouldn't block. Need a short cut to avoid real mining.
/*
BOOST_AUTO_TEST_CASE(mine_local_simple_tx)
{
KeyPair kp1 = KeyPair::create();
@ -115,3 +117,4 @@ BOOST_AUTO_TEST_CASE(mine_and_send_to_peer_fee_check)
BOOST_REQUIRE(c1EndBalance == c1StartBalance - txAmount - gasPrice * gas);
BOOST_REQUIRE(c2EndBalance > 0);
}
*/

381
test/vm.cpp
View File

@ -47,11 +47,11 @@ public:
u256 store(u256 _n)
{
return get<3>(addresses[myAddress])[_n];
return get<2>(addresses[myAddress])[_n];
}
void setStore(u256 _n, u256 _v)
{
get<3>(addresses[myAddress])[_n] = _v;
get<2>(addresses[myAddress])[_n] = _v;
}
u256 balance(Address _a) { return get<0>(addresses[_a]); }
void subBalance(u256 _a) { get<0>(addresses[myAddress]) -= _a; }
@ -61,36 +61,41 @@ public:
get<0>(addresses[_a]) += get<0>(addresses[myAddress]);
addresses.erase(myAddress);
}
void transact(Transaction& _t)
h160 create(u256 _endowment, u256* _gas, bytesConstRef _init)
{
if (get<0>(addresses[myAddress]) >= _t.value)
Address na = right160(sha3(rlpList(myAddress, get<1>(addresses[myAddress]))));
if (get<0>(addresses[myAddress]) >= _endowment)
{
get<0>(addresses[myAddress]) -= _t.value;
get<0>(addresses[myAddress]) -= _endowment;
get<1>(addresses[myAddress])++;
// get<0>(addresses[_t.receiveAddress]) += _t.value;
txs.push_back(_t);
get<0>(addresses[na]) = _endowment;
// TODO: actually execute...
}
}
h160 create(u256 _endowment, u256* _gas, bytesConstRef _init)
{
Transaction t;
t.value = _endowment;
t.gasPrice = gasPrice;
t.gas = *_gas;
t.data = _init.toBytes();
txs.push_back(t);
return right160(t.sha3(false));
callcreates.push_back(t);
return na;
}
bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out)
{
if (get<0>(addresses[myAddress]) >= _value)
{
get<0>(addresses[myAddress]) -= _value;
get<1>(addresses[myAddress])++;
get<0>(addresses[_receiveAddress]) += _value;
// TODO: actually execute...
}
Transaction t;
t.value = _value;
t.gasPrice = gasPrice;
t.gas = *_gas;
t.data = _data.toVector();
t.receiveAddress = _receiveAddress;
txs.push_back(t);
callcreates.push_back(t);
(void)_out;
return true;
}
@ -99,54 +104,69 @@ public:
{
caller = origin = _caller;
value = _value;
data = &_data;
data = &(thisTxData = _data);
gasPrice = _gasPrice;
}
void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, bytes const& _code, map<u256, u256> const& _storage)
void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, map<u256, u256> const& _storage, bytes const& _code)
{
myAddress = _myAddress;
set(myAddress, _myBalance, _myNonce, _code, _storage);
set(myAddress, _myBalance, _myNonce, _storage, _code);
}
void set(Address _a, u256 _myBalance, u256 _myNonce, bytes const& _code, map<u256, u256> const& _storage)
void set(Address _a, u256 _myBalance, u256 _myNonce, map<u256, u256> const& _storage, bytes const& _code)
{
get<0>(addresses[_a]) = _myBalance;
get<1>(addresses[_a]) = _myNonce;
get<2>(addresses[_a]) = 0;
get<3>(addresses[_a]) = _storage;
get<4>(addresses[_a]) = _code;
get<2>(addresses[_a]) = _storage;
get<3>(addresses[_a]) = _code;
}
void reset(u256 _myBalance, u256 _myNonce, map<u256, u256> const& _storage)
{
txs.clear();
callcreates.clear();
addresses.clear();
set(myAddress, _myBalance, _myNonce, get<4>(addresses[myAddress]), _storage);
set(myAddress, _myBalance, _myNonce, _storage, get<3>(addresses[myAddress]));
}
mObject exportEnv()
{
mObject ret;
ret["previousHash"] = toString(previousBlock.hash);
ret["previousNonce"] = toString(previousBlock.nonce);
push(ret, "currentDifficulty", currentBlock.difficulty);
push(ret, "currentTimestamp", currentBlock.timestamp);
ret["currentCoinbase"] = toString(currentBlock.coinbaseAddress);
push(ret, "currentNumber", currentBlock.number);
push(ret, "currentGasLimit", currentBlock.gasLimit);
mArray c;
for (auto const& i: code)
push(c, i);
ret["code"] = c;
return ret;
}
void importEnv(mObject& _o)
{
BOOST_REQUIRE(_o.count("previousHash") > 0 );
BOOST_REQUIRE(_o.count("previousNonce") > 0 );
BOOST_REQUIRE(_o.count("currentDifficulty") > 0 );
BOOST_REQUIRE(_o.count("currentTimestamp") > 0 );
BOOST_REQUIRE(_o.count("currentCoinbase") > 0 );
BOOST_REQUIRE(_o.count("previousHash") > 0);
BOOST_REQUIRE(_o.count("currentGasLimit") > 0);
BOOST_REQUIRE(_o.count("currentDifficulty") > 0);
BOOST_REQUIRE(_o.count("currentTimestamp") > 0);
BOOST_REQUIRE(_o.count("currentCoinbase") > 0);
BOOST_REQUIRE(_o.count("currentNumber") > 0);
previousBlock.hash = h256(_o["previousHash"].get_str());
previousBlock.nonce = h256(_o["previousNonce"].get_str());
currentBlock.number = toInt(_o["currentNumber"]);
currentBlock.gasLimit = toInt(_o["gasLimit"]);
currentBlock.difficulty = toInt(_o["currentDifficulty"]);
currentBlock.timestamp = toInt(_o["currentTimestamp"]);
currentBlock.coinbaseAddress = Address(_o["currentCoinbase"].get_str());
thisTxCode.clear();
if (_o["code"].type() == str_type)
compileLisp(_o["code"].get_str(), false, thisTxCode);
else
for (auto const& j: _o["code"].get_array())
thisTxCode.push_back(toByte(j));
code = &thisTxCode;
}
static u256 toInt(mValue const& _v)
@ -200,31 +220,38 @@ public:
push(o, "balance", get<0>(a.second));
push(o, "nonce", get<1>(a.second));
mObject store;
string curKey;
u256 li = 0;
mArray curVal;
for (auto const& s: get<3>(a.second))
{
if (!li || s.first > li + 8)
mObject store;
string curKey;
u256 li = 0;
mArray curVal;
for (auto const& s: get<2>(a.second))
{
if (li)
store[curKey] = curVal;
li = s.first;
curKey = toString(li);
curVal = mArray();
if (!li || s.first > li + 8)
{
if (li)
store[curKey] = curVal;
li = s.first;
curKey = toString(li);
curVal = mArray();
}
else
for (; li != s.first; ++li)
curVal.push_back(0);
push(curVal, s.second);
++li;
}
else
for (; li != s.first; ++li)
curVal.push_back(0);
push(curVal, s.second);
++li;
if (li)
store[curKey] = curVal;
o["storage"] = store;
}
if (li)
{
store[curKey] = curVal;
o["store"] = store;
mArray d;
for (auto const& i: get<3>(a.second))
push(d, i);
ret["code"] = d;
}
ret[toString(a.first)] = o;
}
return ret;
@ -235,38 +262,40 @@ public:
for (auto const& i: _o)
{
mObject o = i.second.get_obj();
BOOST_REQUIRE(o.count("balance") > 0 );
BOOST_REQUIRE(o.count("nonce") > 0 );
BOOST_REQUIRE(o.count("store") > 0 );
BOOST_REQUIRE(o.count("balance") > 0);
BOOST_REQUIRE(o.count("nonce") > 0);
BOOST_REQUIRE(o.count("storage") > 0);
BOOST_REQUIRE(o.count("code") > 0);
auto& a = addresses[Address(i.first)];
get<0>(a) = toInt(o["balance"]);
get<1>(a) = toInt(o["nonce"]);
if (o.count("store"))
for (auto const& j: o["store"].get_obj())
{
u256 adr(j.first);
for (auto const& k: j.second.get_array())
get<3>(a)[adr++] = toInt(k);
}
if (o.count("code"))
for (auto const& j: o["storage"].get_obj())
{
u256 adr(j.first);
for (auto const& k: j.second.get_array())
get<2>(a)[adr++] = toInt(k);
}
if (o["code"].type() == str_type)
compileLisp(o["code"].get_str(), false, get<3>(a));
else
{
bytes e;
bytes d = compileLisp(o["code"].get_str(), false, e);
get<4>(a) = d;
get<3>(a).clear();
for (auto const& j: o["code"].get_array())
get<3>(a).push_back(toByte(j));
}
}
}
mObject exportExec()
{
mObject ret;
ret["address"] = toString(myAddress);
ret["caller"] = toString(caller);
ret["origin"] = toString(origin);
push(ret, "value", value);
push(ret, "gasPrice", gasPrice);
push(ret, "gas", gas);
mArray d;
for (auto const& i: data)
push(d, i);
@ -277,30 +306,37 @@ public:
void importExec(mObject& _o)
{
BOOST_REQUIRE(_o.count("address")> 0);
BOOST_REQUIRE(_o.count("caller") > 0);
BOOST_REQUIRE(_o.count("caller") > 0);
BOOST_REQUIRE(_o.count("origin") > 0);
BOOST_REQUIRE(_o.count("value") > 0);
BOOST_REQUIRE(_o.count("gasPrice") > 0);
BOOST_REQUIRE(_o.count("data") > 0 );
BOOST_REQUIRE(_o.count("data") > 0);
BOOST_REQUIRE(_o.count("gasPrice") > 0);
BOOST_REQUIRE(_o.count("gas") > 0);
myAddress = Address(_o["address"].get_str());
caller = Address(_o["caller"].get_str());
origin = Address(_o["origin"].get_str());
value = toInt(_o["value"]);
gasPrice = toInt(_o["gasPrice"]);
gas = toInt(_o["gas"]);
thisTxData.clear();
for (auto const& j: _o["data"].get_array())
thisTxData.push_back(toByte(j));
if (_o["data"].type() == str_type)
thisTxData = fromHex(_o["data"].get_str());
else
for (auto const& j: _o["data"].get_array())
thisTxData.push_back(toByte(j));
data = &thisTxData;
}
mArray exportTxs()
mArray exportCallCreates()
{
mArray ret;
for (Transaction const& tx: txs)
for (Transaction const& tx: callcreates)
{
mObject o;
o["destination"] = toString(tx.receiveAddress);
push(o, "gasLimit", tx.gas);
push(o, "value", tx.value);
mArray d;
for (auto const& i: tx.data)
@ -311,93 +347,149 @@ public:
return ret;
}
void importTxs(mArray& _txs)
void importCallCreates(mArray& _callcreates)
{
for (mValue& v: _txs)
for (mValue& v: _callcreates)
{
auto tx = v.get_obj();
BOOST_REQUIRE(tx.count("destination") > 0);
BOOST_REQUIRE(tx.count("value") > 0 );
BOOST_REQUIRE(tx.count("data") > 0 );
BOOST_REQUIRE(tx.count("data") > 0);
BOOST_REQUIRE(tx.count("value") > 0);
BOOST_REQUIRE(tx.count("destination") > 0);
BOOST_REQUIRE(tx.count("gasLimit") > 0);
Transaction t;
t.receiveAddress = Address(tx["destination"].get_str());
t.value = toInt(tx["value"]);
for (auto const& j: tx["data"].get_array())
t.data.push_back(toByte(j));
txs.push_back(t);
t.gas = toInt(tx["gasLimit"]);
if (tx["data"].type() == str_type)
t.data = fromHex(tx["data"].get_str());
else
for (auto const& j: tx["data"].get_array())
t.data.push_back(toByte(j));
callcreates.push_back(t);
}
}
map<Address, tuple<u256, u256, u256, map<u256, u256>, bytes>> addresses;
Transactions txs;
map<Address, tuple<u256, u256, map<u256, u256>, bytes>> addresses;
Transactions callcreates;
bytes thisTxData;
bytes thisTxCode;
u256 gas;
};
void doTests(json_spirit::mValue& v, bool _fillin)
void doTests(json_spirit::mValue& v, bool _fillin)
{
for (auto& i: v.get_obj())
{
for (auto& i: v.get_obj())
{
cnote << i.first;
mObject& o = i.second.get_obj();
cnote << i.first;
mObject& o = i.second.get_obj();
BOOST_REQUIRE( o.count("env") > 0 );
BOOST_REQUIRE( o.count("pre") > 0 );
BOOST_REQUIRE( o.count("exec") > 0 );
BOOST_REQUIRE(o.count("env") > 0);
BOOST_REQUIRE(o.count("pre") > 0);
BOOST_REQUIRE(o.count("exec") > 0);
VM vm;
eth::test::FakeExtVM fev;
fev.importEnv(o["env"].get_obj());
fev.importState(o["pre"].get_obj());
VM vm;
eth::test::FakeExtVM fev;
fev.importEnv(o["env"].get_obj());
fev.importState(o["pre"].get_obj());
if (_fillin)
o["pre"] = mValue(fev.exportState());
if (_fillin)
o["pre"] = mValue(fev.exportState());
bytes output;
for (auto i: o["exec"].get_array())
{
fev.importExec(i.get_obj());
output = vm.go(fev).toBytes();
}
if (_fillin)
{
o["post"] = mValue(fev.exportState());
o["txs"] = fev.exportTxs();
mArray df;
for (auto const& i: output)
FakeExtVM::push(df, i);
o["out"] = df;
}
else
bytes output;
for (auto i: o["exec"].get_array())
{
fev.importExec(i.get_obj());
vm.reset(fev.gas);
output = vm.go(fev).toBytes();
}
if (_fillin)
{
o["post"] = mValue(fev.exportState());
o["callcreates"] = fev.exportCallCreates();
mArray df;
for (auto const& i: output)
FakeExtVM::push(df, i);
o["out"] = df;
fev.push(o, "gas", vm.gas());
}
else
{
BOOST_REQUIRE(o.count("post") > 0);
BOOST_REQUIRE(o.count("callcreates") > 0);
BOOST_REQUIRE(o.count("out") > 0);
BOOST_REQUIRE(o.count("gas") > 0);
eth::test::FakeExtVM test;
test.importState(o["post"].get_obj());
test.importCallCreates(o["callcreates"].get_array());
int i = 0;
for (auto const& d: o["out"].get_array())
{
BOOST_REQUIRE( o.count("post") > 0 );
BOOST_REQUIRE( o.count("txs") > 0 );
BOOST_REQUIRE( o.count("out") > 0 );
eth::test::FakeExtVM test;
test.importState(o["post"].get_obj());
test.importTxs(o["txs"].get_array());
int i = 0;
for (auto const& d: o["out"].get_array())
{
BOOST_CHECK_MESSAGE( output[i] == FakeExtVM::toInt(d), "Output byte [" << i << "] different!");
++i;
}
BOOST_CHECK( test.addresses == fev.addresses);
BOOST_CHECK( test.txs == fev.txs );
BOOST_CHECK_MESSAGE(output[i] == FakeExtVM::toInt(d), "Output byte [" << i << "] different!");
++i;
}
BOOST_CHECK(FakeExtVM::toInt(o["gas"]) == vm.gas());
BOOST_CHECK(test.addresses == fev.addresses);
BOOST_CHECK(test.callcreates == fev.callcreates);
}
}
}
/*string makeTestCase()
{
json_spirit::mObject o;
VM vm;
BlockInfo pb;
pb.hash = sha3("previousHash");
pb.nonce = sha3("previousNonce");
BlockInfo cb = pb;
cb.difficulty = 256;
cb.timestamp = 1;
cb.coinbaseAddress = toAddress(sha3("coinbase"));
FakeExtVM fev(pb, cb, 0);
bytes init;
fev.setContract(toAddress(sha3("contract")), ether, 0, compileLisp("(suicide (txsender))", false, init), map<u256, u256>());
o["env"] = fev.exportEnv();
o["pre"] = fev.exportState();
fev.setTransaction(toAddress(sha3("sender")), ether, finney, bytes());
mArray execs;
execs.push_back(fev.exportExec());
o["exec"] = execs;
vm.go(fev);
o["post"] = fev.exportState();
o["txs"] = fev.exportTxs();
return json_spirit::write_string(json_spirit::mValue(o), true);
}*/
} } // Namespace Close
BOOST_AUTO_TEST_CASE(vm_tests)
{
// Populate tests first:
try
{
cnote << "Populating VM tests...";
json_spirit::mValue v;
string s = asString(contents("../../cpp-ethereum/test/vmtests.json"));
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty.");
json_spirit::read_string(s, v);
eth::test::doTests(v, true);
writeFile("../../tests/vmtests.json", asBytes(json_spirit::write_string(v, true)));
}
catch( std::exception& e)
{
BOOST_ERROR("Failed VM Test with Exception: " << e.what());
}
try
{
cnote << "Testing VM...";
json_spirit::mValue v;
string s = asString(contents("../../tests/vmtests.json"));
BOOST_REQUIRE_MESSAGE( s.length() > 0, "Contents of 'vmtests.json' is empty. Have you cloned the 'tests' repo branch develop?" );
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty. Have you cloned the 'tests' repo branch develop?");
json_spirit::read_string(s, v);
eth::test::doTests(v, false);
}
@ -406,38 +498,3 @@ BOOST_AUTO_TEST_CASE(vm_tests)
BOOST_ERROR("Failed VM Test with Exception: " << e.what());
}
}
#if 0
string makeTestCase()
{
json_spirit::mObject o;
VM vm;
BlockInfo pb;
pb.hash = sha3("previousHash");
pb.nonce = sha3("previousNonce");
BlockInfo cb = pb;
cb.difficulty = 256;
cb.timestamp = 1;
cb.coinbaseAddress = toAddress(sha3("coinbase"));
FakeExtVM fev(pb, cb, 0);
bytes init;
fev.setContract(toAddress(sha3("contract")), ether, 0, compileLisp("(suicide (txsender))", false, init), map<u256, u256>());
o["env"] = fev.exportEnv();
o["pre"] = fev.exportState();
fev.setTransaction(toAddress(sha3("sender")), ether, finney, bytes());
mArray execs;
execs.push_back(fev.exportExec());
o["exec"] = execs;
vm.go(fev);
o["post"] = fev.exportState();
o["txs"] = fev.exportTxs();
return json_spirit::write_string(json_spirit::mValue(o), true);
}
};
}
#endif

109
test/vmtests.json
View File

@ -2,26 +2,30 @@
"suicide": {
"env" : {
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
"currentNumber" : "0",
"currentGasLimit" : "1000000",
"currentDifficulty" : "256",
"currentTimestamp" : 1,
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"feeMultiplier" : 1
"code" : "(suicide (caller))"
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 1000000000000000000,
"balance" : "1000000000000000000",
"nonce" : 0,
"code" : "(suicide (txsender))"
"code" : "(suicide (caller))",
"storage": {}
}
},
"exec" : [
{
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 1000000000000000000,
"data" : [
]
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "1000000000000000000",
"data" : "",
"gasPrice" : "100000000000000",
"gas" : "10000"
}
]
},
@ -29,26 +33,30 @@
"arith": {
"env" : {
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
"currentNumber" : "0",
"currentGasLimit" : "1000000",
"currentDifficulty" : "256",
"currentTimestamp" : 1,
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"feeMultiplier" : 1
"code" : "{ (call (- (gas) 200) (caller) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0 0 0 0) }"
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 1000000000000000000,
"balance" : "1000000000000000000",
"nonce" : 0,
"code" : "(seq (mktx (txsender) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0) )"
"code" : "{ (call (- (gas) 200) (caller) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0 0 0 0) }",
"storage": {}
}
},
"exec" : [
{
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 1000000000000000000,
"data" : [
]
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "1000000000000000000",
"data" : "",
"gasPrice" : "100000000000000",
"gas" : "10000"
}
]
},
@ -56,26 +64,30 @@
"boolean": {
"env" : {
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
"currentNumber" : "0",
"currentGasLimit" : "1000000",
"currentDifficulty" : "256",
"currentTimestamp" : 1,
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"feeMultiplier" : 1
"code" : "(seq (when (and 1 1) (call (- (gas) 200) (caller) 2 0 0 0 0)) (when (and 1 0) (call (- (gas) 200) (caller) 3 0 0 0 0)) (when (and 0 1) (call (- (gas) 200) (caller) 4 0 0 0 0)) (when (and 0 0) (call (- (gas) 200) (caller) 5 0 0 0 0)) (when (or 1 1) (call (- (gas) 200) (caller) 12 0 0 0 0)) (when (or 1 0) (call (- (gas) 200) (caller) 13 0 0 0 0)) (when (or 0 1) (call (- (gas) 200) (caller) 14 0 0 0 0)) (when (or 0 0) (call (- (gas) 200) (caller) 15 0 0 0 0)) )"
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 1000000000000000000,
"balance" : "1000000000000000000",
"nonce" : 0,
"code" : "(seq (when (and 1 1) (mktx (txsender) 2 0)) (when (and 1 0) (mktx (txsender) 3 0)) (when (and 0 1) (mktx (txsender) 4 0)) (when (and 0 0) (mktx (txsender) 5 0)) (when (or 1 1) (mktx (txsender) 12 0)) (when (or 1 0) (mktx (txsender) 13 0)) (when (or 0 1) (mktx (txsender) 14 0)) (when (or 0 0) (mktx (txsender) 15 0)) )"
"code" : "(seq (when (and 1 1) (call (- (gas) 200) (caller) 2 0 0 0 0)) (when (and 1 0) (call (- (gas) 200) (caller) 3 0 0 0 0)) (when (and 0 1) (call (- (gas) 200) (caller) 4 0 0 0 0)) (when (and 0 0) (call (- (gas) 200) (caller) 5 0 0 0 0)) (when (or 1 1) (call (- (gas) 200) (caller) 12 0 0 0 0)) (when (or 1 0) (call (- (gas) 200) (caller) 13 0 0 0 0)) (when (or 0 1) (call (- (gas) 200) (caller) 14 0 0 0 0)) (when (or 0 0) (call (- (gas) 200) (caller) 15 0 0 0 0)) )",
"storage": {}
}
},
"exec" : [
{
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 1000000000000000000,
"data" : [
]
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "1000000000000000000",
"data" : "",
"gasPrice" : "100000000000000",
"gas" : "10000"
}
]
},
@ -83,55 +95,30 @@
"mktx": {
"env" : {
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
"currentNumber" : "0",
"currentGasLimit" : "1000000",
"currentDifficulty" : "256",
"currentTimestamp" : 1,
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"feeMultiplier" : 1
"code" : "(call (- (gas) 200) (caller) 500000000000000000 0 0 0 0)"
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 1000000000000000000,
"balance" : "1000000000000000000",
"nonce" : 0,
"code" : "(mktx (txsender) 500000000000000000 0)"
"code" : "(call (- (gas) 200) (caller) 500000000000000000 0 0 0 0)",
"storage": {}
}
},
"exec" : [
{
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 1000000000000000000,
"data" : [
]
}
]
},
"fan": {
"env" : {
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae",
"currentDifficulty" : "256",
"currentTimestamp" : 1,
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"feeMultiplier" : 1
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 0,
"nonce" : 0,
"code" : "(seq (unless (gt (txvalue) 100finney) (stop)) (\"value\" (div (sub (txvalue) 100finney) (txdatan))) (\"i\" 0) (for (lt (\"i\") (txdatan)) (seq (mktx (txdata (\"i\")) (\"value\") 0) (\"i\" (add (\"i\") 1)) ) ) )"
}
},
"exec" : [
{
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 1000000000000000000,
"data" : [
"0xcd1722f3947def4cf144679da39c4c32bdc35681",
"0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
]
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "1000000000000000000",
"gasPrice" : "100000000000000",
"gas" : "10000",
"data" : ""
}
]
}

Write Preview
Loading…
Cancel
Save