mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge remote-tracking branch 'upstream/develop' into NewStateTests
Conflicts: test/state.cpp
This commit is contained in:
commit
e00df9b681
@ -3,45 +3,28 @@ cmake_policy(SET CMP0015 NEW)
|
|||||||
aux_source_directory(. SRC_LIST)
|
aux_source_directory(. SRC_LIST)
|
||||||
list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp")
|
list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp")
|
||||||
|
|
||||||
|
include_directories(${CRYPTOPP_INCLUDE_DIRS})
|
||||||
|
include_directories(${JSONCPP_INCLUDE_DIRS})
|
||||||
|
include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
|
||||||
include_directories(..)
|
include_directories(..)
|
||||||
|
|
||||||
file(GLOB HEADERS "*.h")
|
file(GLOB HEADERS "*.h")
|
||||||
add_executable(testeth ${SRC_LIST} ${HEADERS})
|
add_executable(testeth ${SRC_LIST} ${HEADERS})
|
||||||
add_executable(createRandomTest createRandomTest.cpp vm.cpp TestHelper.cpp)
|
add_executable(createRandomTest createRandomTest.cpp vm.cpp TestHelper.cpp)
|
||||||
|
|
||||||
|
target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE})
|
||||||
|
target_link_libraries(testeth ${CURL_LIBRARIES})
|
||||||
target_link_libraries(testeth ethereum)
|
target_link_libraries(testeth ethereum)
|
||||||
target_link_libraries(testeth ethcore)
|
target_link_libraries(testeth ethcore)
|
||||||
target_link_libraries(testeth secp256k1)
|
target_link_libraries(testeth secp256k1)
|
||||||
target_link_libraries(testeth gmp)
|
|
||||||
target_link_libraries(testeth solidity)
|
target_link_libraries(testeth solidity)
|
||||||
target_link_libraries(testeth ${CRYPTOPP_LS})
|
|
||||||
target_link_libraries(testeth webthree)
|
target_link_libraries(testeth webthree)
|
||||||
if(JSONRPC_LS)
|
|
||||||
target_link_libraries(testeth web3jsonrpc)
|
if (JSONRPC)
|
||||||
|
target_link_libraries(testeth web3jsonrpc)
|
||||||
|
target_link_libraries(testeth ${JSON_RPC_CPP_CLIENT_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE})
|
||||||
target_link_libraries(createRandomTest ethereum)
|
target_link_libraries(createRandomTest ethereum)
|
||||||
target_link_libraries(createRandomTest ethcore)
|
target_link_libraries(createRandomTest ethcore)
|
||||||
target_link_libraries(createRandomTest boost_chrono)
|
|
||||||
target_link_libraries(createRandomTest boost_unit_test_framework)
|
|
||||||
|
|
||||||
if ("${TARGET_PLATFORM}" STREQUAL "w64")
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
|
|
||||||
target_link_libraries(testeth boost_system-mt-s)
|
|
||||||
target_link_libraries(testeth boost_filesystem-mt-s)
|
|
||||||
target_link_libraries(testeth boost_thread_win32-mt-s)
|
|
||||||
target_link_libraries(testeth gcc)
|
|
||||||
target_link_libraries(testeth gdi32)
|
|
||||||
target_link_libraries(testeth ws2_32)
|
|
||||||
target_link_libraries(testeth mswsock)
|
|
||||||
target_link_libraries(testeth shlwapi)
|
|
||||||
target_link_libraries(testeth iphlpapi)
|
|
||||||
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
|
|
||||||
elseif (UNIX)
|
|
||||||
find_package(Boost 1.53 REQUIRED COMPONENTS unit_test_framework)
|
|
||||||
else ()
|
|
||||||
target_link_libraries(testeth boost_system)
|
|
||||||
target_link_libraries(testeth boost_filesystem)
|
|
||||||
find_package(Threads REQUIRED)
|
|
||||||
target_link_libraries(testeth ${CMAKE_THREAD_LIBS_INIT})
|
|
||||||
endif ()
|
|
||||||
|
@ -72,6 +72,7 @@ ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller): m_TestObject(_o
|
|||||||
if (!isFiller)
|
if (!isFiller)
|
||||||
{
|
{
|
||||||
importState(_o["post"].get_obj(), m_statePost);
|
importState(_o["post"].get_obj(), m_statePost);
|
||||||
|
m_environment.sub.logs = importLog(_o["logs"].get_array());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,9 +109,6 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
|
|||||||
|
|
||||||
Address address = Address(i.first);
|
Address address = Address(i.first);
|
||||||
|
|
||||||
for (auto const& j: o["storage"].get_obj())
|
|
||||||
_state.setStorage(address, toInt(j.first), toInt(j.second));
|
|
||||||
|
|
||||||
bytes code = importCode(o);
|
bytes code = importCode(o);
|
||||||
|
|
||||||
if (code.size())
|
if (code.size())
|
||||||
@ -121,6 +119,9 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
|
|||||||
else
|
else
|
||||||
_state.m_cache[address] = Account(toInt(o["balance"]), Account::NormalCreation);
|
_state.m_cache[address] = Account(toInt(o["balance"]), Account::NormalCreation);
|
||||||
|
|
||||||
|
for (auto const& j: o["storage"].get_obj())
|
||||||
|
_state.setStorage(address, toInt(j.first), toInt(j.second));
|
||||||
|
|
||||||
for(int i=0; i<toInt(o["nonce"]); ++i)
|
for(int i=0; i<toInt(o["nonce"]); ++i)
|
||||||
_state.noteSending(address);
|
_state.noteSending(address);
|
||||||
|
|
||||||
@ -148,6 +149,9 @@ void ImportTest::exportTest(bytes _output, State& _statePost)
|
|||||||
// export output
|
// export output
|
||||||
m_TestObject["out"] = "0x" + toHex(_output);
|
m_TestObject["out"] = "0x" + toHex(_output);
|
||||||
|
|
||||||
|
// export logs
|
||||||
|
m_TestObject["logs"] = exportLog(_statePost.pending().size() ? _statePost.log(0) : LogEntries());
|
||||||
|
|
||||||
// export post state
|
// export post state
|
||||||
json_spirit::mObject postState;
|
json_spirit::mObject postState;
|
||||||
|
|
||||||
@ -255,6 +259,46 @@ bytes importCode(json_spirit::mObject& _o)
|
|||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LogEntries importLog(json_spirit::mArray& _a)
|
||||||
|
{
|
||||||
|
LogEntries logEntries;
|
||||||
|
for (auto const& l: _a)
|
||||||
|
{
|
||||||
|
json_spirit::mObject o = l.get_obj();
|
||||||
|
// cant use BOOST_REQUIRE, because this function is used outside boost test (createRandomTest)
|
||||||
|
assert(o.count("address") > 0);
|
||||||
|
assert(o.count("topics") > 0);
|
||||||
|
assert(o.count("data") > 0);
|
||||||
|
assert(o.count("bloom") > 0);
|
||||||
|
LogEntry log;
|
||||||
|
log.address = Address(o["address"].get_str());
|
||||||
|
for (auto const& t: o["topics"].get_array())
|
||||||
|
log.topics.push_back(h256(t.get_str()));
|
||||||
|
log.data = importData(o);
|
||||||
|
logEntries.push_back(log);
|
||||||
|
}
|
||||||
|
return logEntries;
|
||||||
|
}
|
||||||
|
|
||||||
|
json_spirit::mArray exportLog(eth::LogEntries _logs)
|
||||||
|
{
|
||||||
|
json_spirit::mArray ret;
|
||||||
|
if (_logs.size() == 0) return ret;
|
||||||
|
for (LogEntry const& l: _logs)
|
||||||
|
{
|
||||||
|
json_spirit::mObject o;
|
||||||
|
o["address"] = toString(l.address);
|
||||||
|
json_spirit::mArray topics;
|
||||||
|
for (auto const& t: l.topics)
|
||||||
|
topics.push_back(toString(t));
|
||||||
|
o["topics"] = topics;
|
||||||
|
o["data"] = "0x" + toHex(l.data);
|
||||||
|
o["bloom"] = toString(l.bloom());
|
||||||
|
ret.push_back(o);
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
void checkOutput(bytes const& _output, json_spirit::mObject& _o)
|
void checkOutput(bytes const& _output, json_spirit::mObject& _o)
|
||||||
{
|
{
|
||||||
int j = 0;
|
int j = 0;
|
||||||
@ -285,6 +329,24 @@ void checkStorage(map<u256, u256> _expectedStore, map<u256, u256> _resultStore,
|
|||||||
BOOST_CHECK_MESSAGE(expectedStoreValue == resultStoreValue, _expectedAddr << ": store[" << expectedStoreKey << "] = " << resultStoreValue << ", expected " << expectedStoreValue);
|
BOOST_CHECK_MESSAGE(expectedStoreValue == resultStoreValue, _expectedAddr << ": store[" << expectedStoreKey << "] = " << resultStoreValue << ", expected " << expectedStoreValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
BOOST_CHECK_EQUAL(_resultStore.size(), _expectedStore.size());
|
||||||
|
#ifndef __WIN32__
|
||||||
|
for (auto&& resultStorePair : _resultStore)
|
||||||
|
if (!_expectedStore.count(resultStorePair.first))
|
||||||
|
BOOST_ERROR(_expectedAddr << ": unexpected store key " << resultStorePair.first);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void checkLog(LogEntries _resultLogs, LogEntries _expectedLogs)
|
||||||
|
{
|
||||||
|
BOOST_REQUIRE_EQUAL(_resultLogs.size(), _expectedLogs.size());
|
||||||
|
|
||||||
|
for (size_t i = 0; i < _resultLogs.size(); ++i)
|
||||||
|
{
|
||||||
|
BOOST_CHECK_EQUAL(_resultLogs[i].address, _expectedLogs[i].address);
|
||||||
|
BOOST_CHECK_EQUAL(_resultLogs[i].topics, _expectedLogs[i].topics);
|
||||||
|
BOOST_CHECK(_resultLogs[i].data == _expectedLogs[i].data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string getTestPath()
|
std::string getTestPath()
|
||||||
@ -310,12 +372,13 @@ void userDefinedTest(string testTypeFlag, std::function<void(json_spirit::mValue
|
|||||||
string arg = boost::unit_test::framework::master_test_suite().argv[i];
|
string arg = boost::unit_test::framework::master_test_suite().argv[i];
|
||||||
if (arg == testTypeFlag)
|
if (arg == testTypeFlag)
|
||||||
{
|
{
|
||||||
if (i + 1 >= boost::unit_test::framework::master_test_suite().argc)
|
if (boost::unit_test::framework::master_test_suite().argc <= i + 2)
|
||||||
{
|
{
|
||||||
cnote << "Missing filename\nUsage: testeth " << testTypeFlag << " <filename>\n";
|
cnote << "Missing filename\nUsage: testeth " << testTypeFlag << " <filename> <testname>\n";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
string filename = boost::unit_test::framework::master_test_suite().argv[i + 1];
|
string filename = boost::unit_test::framework::master_test_suite().argv[i + 1];
|
||||||
|
string testname = boost::unit_test::framework::master_test_suite().argv[i + 2];
|
||||||
int currentVerbosity = g_logVerbosity;
|
int currentVerbosity = g_logVerbosity;
|
||||||
g_logVerbosity = 12;
|
g_logVerbosity = 12;
|
||||||
try
|
try
|
||||||
@ -325,7 +388,19 @@ void userDefinedTest(string testTypeFlag, std::function<void(json_spirit::mValue
|
|||||||
string s = asString(contents(filename));
|
string s = asString(contents(filename));
|
||||||
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + filename + " is empty. ");
|
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + filename + " is empty. ");
|
||||||
json_spirit::read_string(s, v);
|
json_spirit::read_string(s, v);
|
||||||
doTests(v, false);
|
json_spirit::mObject oSingleTest;
|
||||||
|
|
||||||
|
json_spirit::mObject::const_iterator pos = v.get_obj().find(testname);
|
||||||
|
if (pos == v.get_obj().end())
|
||||||
|
{
|
||||||
|
cnote << "Could not find test: " << testname << " in " << filename << "\n";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
oSingleTest[pos->first] = pos->second;
|
||||||
|
|
||||||
|
json_spirit::mValue v_singleTest(oSingleTest);
|
||||||
|
doTests(v_singleTest, false);
|
||||||
}
|
}
|
||||||
catch (Exception const& _e)
|
catch (Exception const& _e)
|
||||||
{
|
{
|
||||||
@ -374,6 +449,7 @@ void executeTests(const string& _name, const string& _testPathAppendix, std::fun
|
|||||||
{
|
{
|
||||||
BOOST_ERROR("Failed test with Exception: " << _e.what());
|
BOOST_ERROR("Failed test with Exception: " << _e.what());
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include "JsonSpiritHeaders.h"
|
#include "JsonSpiritHeaders.h"
|
||||||
#include <libethereum/State.h>
|
#include <libethereum/State.h>
|
||||||
|
#include <libevm/ExtVMFace.h>
|
||||||
|
|
||||||
namespace dev
|
namespace dev
|
||||||
{
|
{
|
||||||
@ -67,8 +68,11 @@ u256 toInt(json_spirit::mValue const& _v);
|
|||||||
byte toByte(json_spirit::mValue const& _v);
|
byte toByte(json_spirit::mValue const& _v);
|
||||||
bytes importCode(json_spirit::mObject& _o);
|
bytes importCode(json_spirit::mObject& _o);
|
||||||
bytes importData(json_spirit::mObject& _o);
|
bytes importData(json_spirit::mObject& _o);
|
||||||
|
eth::LogEntries importLog(json_spirit::mArray& _o);
|
||||||
|
json_spirit::mArray exportLog(eth::LogEntries _logs);
|
||||||
void checkOutput(bytes const& _output, json_spirit::mObject& _o);
|
void checkOutput(bytes const& _output, json_spirit::mObject& _o);
|
||||||
void checkStorage(std::map<u256, u256> _expectedStore, std::map<u256, u256> _resultStore, Address _expectedAddr);
|
void checkStorage(std::map<u256, u256> _expectedStore, std::map<u256, u256> _resultStore, Address _expectedAddr);
|
||||||
|
void checkLog(eth::LogEntries _resultLogs, eth::LogEntries _expectedLogs);
|
||||||
void executeTests(const std::string& _name, const std::string& _testPathAppendix, std::function<void(json_spirit::mValue&, bool)> doTests);
|
void executeTests(const std::string& _name, const std::string& _testPathAppendix, std::function<void(json_spirit::mValue&, bool)> doTests);
|
||||||
std::string getTestPath();
|
std::string getTestPath();
|
||||||
void userDefinedTest(std::string testTypeFlag, std::function<void(json_spirit::mValue&, bool)> doTests);
|
void userDefinedTest(std::string testTypeFlag, std::function<void(json_spirit::mValue&, bool)> doTests);
|
||||||
|
@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is part of cpp-ethereum.
|
|
||||||
|
|
||||||
cpp-ethereum is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
cpp-ethereum is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
/** @file TestHelperCrypto.h
|
|
||||||
* @author Alex Leverington <nessence@gmail.com>
|
|
||||||
* @date 2014
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <libdevcrypto/CryptoPP.h>
|
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
using namespace CryptoPP;
|
|
||||||
|
|
||||||
void SavePrivateKey(const PrivateKey& key, const string& file = "ecies.private.key")
|
|
||||||
{
|
|
||||||
FileSink sink(file.c_str());
|
|
||||||
key.Save(sink);
|
|
||||||
}
|
|
||||||
|
|
||||||
void SavePublicKey(const PublicKey& key, const string& file = "ecies.public.key")
|
|
||||||
{
|
|
||||||
FileSink sink(file.c_str());
|
|
||||||
key.Save(sink);
|
|
||||||
}
|
|
||||||
|
|
||||||
void LoadPrivateKey(PrivateKey& key, const string& file = "ecies.private.key")
|
|
||||||
{
|
|
||||||
FileSource source(file.c_str(), true);
|
|
||||||
key.Load(source);
|
|
||||||
}
|
|
||||||
|
|
||||||
void LoadPublicKey(PublicKey& key, const string& file = "ecies.public.key")
|
|
||||||
{
|
|
||||||
FileSource source(file.c_str(), true);
|
|
||||||
key.Load(source);
|
|
||||||
}
|
|
@ -32,7 +32,7 @@
|
|||||||
#include <libdevcore/CommonIO.h>
|
#include <libdevcore/CommonIO.h>
|
||||||
#include <libdevcore/CommonData.h>
|
#include <libdevcore/CommonData.h>
|
||||||
#include <libevmcore/Instruction.h>
|
#include <libevmcore/Instruction.h>
|
||||||
#include <libevm/VM.h>
|
#include <libevm/VMFactory.h>
|
||||||
#include "vm.h"
|
#include "vm.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
@ -121,14 +121,14 @@ void doMyTests(json_spirit::mValue& v)
|
|||||||
{
|
{
|
||||||
for (auto& i: v.get_obj())
|
for (auto& i: v.get_obj())
|
||||||
{
|
{
|
||||||
|
cnote << i.first;
|
||||||
mObject& o = i.second.get_obj();
|
mObject& o = i.second.get_obj();
|
||||||
|
|
||||||
assert(o.count("env") > 0);
|
assert(o.count("env") > 0);
|
||||||
assert(o.count("pre") > 0);
|
assert(o.count("pre") > 0);
|
||||||
assert(o.count("exec") > 0);
|
assert(o.count("exec") > 0);
|
||||||
|
|
||||||
eth::VM vm;
|
dev::test::FakeExtVM fev;
|
||||||
test::FakeExtVM fev;
|
|
||||||
fev.importEnv(o["env"].get_obj());
|
fev.importEnv(o["env"].get_obj());
|
||||||
fev.importState(o["pre"].get_obj());
|
fev.importState(o["pre"].get_obj());
|
||||||
|
|
||||||
@ -141,17 +141,20 @@ void doMyTests(json_spirit::mValue& v)
|
|||||||
fev.code = fev.thisTxCode;
|
fev.code = fev.thisTxCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
vm.reset(fev.gas);
|
|
||||||
bytes output;
|
bytes output;
|
||||||
|
auto vm = eth::VMFactory::create(fev.gas);
|
||||||
|
|
||||||
u256 gas;
|
u256 gas;
|
||||||
|
bool vmExceptionOccured = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
output = vm.go(fev).toBytes();
|
output = vm->go(fev, fev.simpleTrace()).toBytes();
|
||||||
|
gas = vm->gas();
|
||||||
}
|
}
|
||||||
catch (eth::VMException const& _e)
|
catch (eth::VMException const& _e)
|
||||||
{
|
{
|
||||||
cnote << "VM did throw an exception: " << diagnostic_information(_e);
|
cnote << "VM did throw an exception: " << diagnostic_information(_e);
|
||||||
gas = 0;
|
vmExceptionOccured = true;
|
||||||
}
|
}
|
||||||
catch (Exception const& _e)
|
catch (Exception const& _e)
|
||||||
{
|
{
|
||||||
@ -180,9 +183,13 @@ void doMyTests(json_spirit::mValue& v)
|
|||||||
|
|
||||||
o["env"] = mValue(fev.exportEnv());
|
o["env"] = mValue(fev.exportEnv());
|
||||||
o["exec"] = mValue(fev.exportExec());
|
o["exec"] = mValue(fev.exportExec());
|
||||||
o["post"] = mValue(fev.exportState());
|
if (!vmExceptionOccured)
|
||||||
o["callcreates"] = fev.exportCallCreates();
|
{
|
||||||
o["out"] = "0x" + toHex(output);
|
o["post"] = mValue(fev.exportState());
|
||||||
fev.push(o, "gas", gas);
|
o["callcreates"] = fev.exportCallCreates();
|
||||||
|
o["out"] = "0x" + toHex(output);
|
||||||
|
fev.push(o, "gas", gas);
|
||||||
|
o["logs"] = test::exportLog(fev.sub.logs);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
302
crypto.cpp
302
crypto.cpp
@ -27,9 +27,9 @@
|
|||||||
#include <libdevcore/Log.h>
|
#include <libdevcore/Log.h>
|
||||||
#include <libethereum/Transaction.h>
|
#include <libethereum/Transaction.h>
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <libdevcrypto/EC.h>
|
#include <libdevcrypto/SHA3.h>
|
||||||
#include <libdevcrypto/SHA3MAC.h>
|
#include <libdevcrypto/ECDHE.h>
|
||||||
#include "TestHelperCrypto.h"
|
#include <libdevcrypto/CryptoPP.h>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace dev;
|
using namespace dev;
|
||||||
@ -38,9 +38,41 @@ using namespace CryptoPP;
|
|||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE(devcrypto)
|
BOOST_AUTO_TEST_SUITE(devcrypto)
|
||||||
|
|
||||||
|
static Secp256k1 s_secp256k1;
|
||||||
|
static CryptoPP::AutoSeededRandomPool s_rng;
|
||||||
|
static CryptoPP::OID s_curveOID(CryptoPP::ASN1::secp256k1());
|
||||||
|
static CryptoPP::DL_GroupParameters_EC<CryptoPP::ECP> s_params(s_curveOID);
|
||||||
|
static CryptoPP::DL_GroupParameters_EC<CryptoPP::ECP>::EllipticCurve s_curve(s_params.GetCurve());
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(emptySHA3Types)
|
||||||
|
{
|
||||||
|
h256 emptyListSHA3(fromHex("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"));
|
||||||
|
BOOST_REQUIRE_EQUAL(emptyListSHA3, EmptyListSHA3);
|
||||||
|
|
||||||
|
h256 emptySHA3(fromHex("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
|
||||||
|
BOOST_REQUIRE_EQUAL(emptySHA3, EmptySHA3);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(cryptopp_patch)
|
||||||
|
{
|
||||||
|
KeyPair k = KeyPair::create();
|
||||||
|
bytes io_text;
|
||||||
|
s_secp256k1.decrypt(k.sec(), io_text);
|
||||||
|
BOOST_REQUIRE_EQUAL(io_text.size(), 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(verify_secert)
|
||||||
|
{
|
||||||
|
h256 empty;
|
||||||
|
KeyPair kNot(empty);
|
||||||
|
BOOST_REQUIRE(!kNot.address());
|
||||||
|
KeyPair k(sha3(empty));
|
||||||
|
BOOST_REQUIRE(k.address());
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(common_encrypt_decrypt)
|
BOOST_AUTO_TEST_CASE(common_encrypt_decrypt)
|
||||||
{
|
{
|
||||||
string message("Now is the time for all good persons to come to the aide of humanity.");
|
string message("Now is the time for all good persons to come to the aid of humanity.");
|
||||||
bytes m = asBytes(message);
|
bytes m = asBytes(message);
|
||||||
bytesConstRef bcr(&m);
|
bytesConstRef bcr(&m);
|
||||||
|
|
||||||
@ -56,103 +88,50 @@ BOOST_AUTO_TEST_CASE(common_encrypt_decrypt)
|
|||||||
BOOST_REQUIRE(plain == asBytes(message));
|
BOOST_REQUIRE(plain == asBytes(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(cryptopp_vs_secp256k1)
|
|
||||||
{
|
|
||||||
ECIES<ECP>::Decryptor d(pp::PRNG, pp::secp256k1Curve);
|
|
||||||
ECIES<ECP>::Encryptor e(d.GetKey());
|
|
||||||
|
|
||||||
Secret s;
|
|
||||||
pp::exportPrivateKey(d.GetKey(), s);
|
|
||||||
|
|
||||||
Public p;
|
|
||||||
pp::exportPublicKey(e.GetKey(), p);
|
|
||||||
|
|
||||||
BOOST_REQUIRE(dev::toAddress(s) == right160(dev::sha3(p.ref())));
|
|
||||||
|
|
||||||
Secret previous = s;
|
|
||||||
for (auto i = 0; i < 2; i++)
|
|
||||||
{
|
|
||||||
ECIES<ECP>::Decryptor d(pp::PRNG, pp::secp256k1Curve);
|
|
||||||
ECIES<ECP>::Encryptor e(d.GetKey());
|
|
||||||
|
|
||||||
Secret s;
|
|
||||||
pp::exportPrivateKey(d.GetKey(), s);
|
|
||||||
BOOST_REQUIRE(s != previous);
|
|
||||||
|
|
||||||
Public p;
|
|
||||||
pp::exportPublicKey(e.GetKey(), p);
|
|
||||||
|
|
||||||
h160 secp256k1Addr = dev::toAddress(s);
|
|
||||||
h160 cryptoppAddr = right160(dev::sha3(p.ref()));
|
|
||||||
if (secp256k1Addr != cryptoppAddr)
|
|
||||||
{
|
|
||||||
BOOST_REQUIRE(secp256k1Addr == cryptoppAddr);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(cryptopp_cryptopp_secp256k1libport)
|
BOOST_AUTO_TEST_CASE(cryptopp_cryptopp_secp256k1libport)
|
||||||
{
|
{
|
||||||
// cryptopp implementation of secp256k1lib sign_compact w/recid parameter and recovery of public key from signature
|
secp256k1_start();
|
||||||
|
|
||||||
// base secret
|
// base secret
|
||||||
Secret secret(sha3("privacy"));
|
Secret secret(sha3("privacy"));
|
||||||
|
|
||||||
// we get ec params from signer
|
// we get ec params from signer
|
||||||
const CryptoPP::DL_GroupParameters_EC<CryptoPP::ECP> params = pp::secp256k1Params;
|
|
||||||
ECDSA<ECP, SHA3_256>::Signer signer;
|
ECDSA<ECP, SHA3_256>::Signer signer;
|
||||||
|
|
||||||
// e := sha3(msg)
|
// e := sha3(msg)
|
||||||
bytes e(fromHex("0x01"));
|
bytes e(fromHex("0x01"));
|
||||||
e.resize(32);
|
e.resize(32);
|
||||||
int tests = 2; // Oct 29: successful @ 1500
|
int tests = 2;
|
||||||
while (sha3(&e, &e), secret = sha3(secret.asBytes()), tests--)
|
while (sha3(&e, &e), secret = sha3(secret.asBytes()), tests--)
|
||||||
{
|
{
|
||||||
KeyPair key(secret);
|
KeyPair key(secret);
|
||||||
Public pkey = key.pub();
|
Public pkey = key.pub();
|
||||||
pp::initializeDLScheme(secret, signer);
|
signer.AccessKey().Initialize(s_params, secretToExponent(secret));
|
||||||
|
|
||||||
h256 he(sha3(e));
|
h256 he(sha3(e));
|
||||||
Integer heInt(he.asBytes().data(), 32);
|
Integer heInt(he.asBytes().data(), 32);
|
||||||
h256 k(crypto::kdf(secret, he));
|
h256 k(crypto::kdf(secret, he));
|
||||||
Integer kInt(k.asBytes().data(), 32);
|
Integer kInt(k.asBytes().data(), 32);
|
||||||
kInt %= params.GetSubgroupOrder()-1;
|
kInt %= s_params.GetSubgroupOrder()-1;
|
||||||
|
|
||||||
ECP::Point rp = params.ExponentiateBase(kInt);
|
ECP::Point rp = s_params.ExponentiateBase(kInt);
|
||||||
Integer const& q = params.GetGroupOrder();
|
Integer const& q = s_params.GetGroupOrder();
|
||||||
Integer r = params.ConvertElementToInteger(rp);
|
Integer r = s_params.ConvertElementToInteger(rp);
|
||||||
int recid = ((r >= q) ? 2 : 0) | (rp.y.IsOdd() ? 1 : 0);
|
|
||||||
|
|
||||||
Integer kInv = kInt.InverseMod(q);
|
Integer kInv = kInt.InverseMod(q);
|
||||||
Integer s = (kInv * (Integer(secret.asBytes().data(), 32)*r + heInt)) % q;
|
Integer s = (kInv * (Integer(secret.asBytes().data(), 32)*r + heInt)) % q;
|
||||||
BOOST_REQUIRE(!!r && !!s);
|
BOOST_REQUIRE(!!r && !!s);
|
||||||
|
|
||||||
/*
|
|
||||||
// For future reference:
|
|
||||||
// According to maths, this codepath can't be reached, however, it's in secp256k1.
|
|
||||||
// Commenting this out diverges from codebase implementation.
|
|
||||||
// To be removed after upstream PR and proof are evaulated.
|
|
||||||
|
|
||||||
if (s > params.GetSubgroupOrder())
|
|
||||||
{
|
|
||||||
// note: this rarely happens
|
|
||||||
s = params.GetGroupOrder() - s;
|
|
||||||
if (recid)
|
|
||||||
recid ^= 1;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
Signature sig;
|
Signature sig;
|
||||||
|
sig[64] = rp.y.IsOdd() ? 1 : 0;
|
||||||
r.Encode(sig.data(), 32);
|
r.Encode(sig.data(), 32);
|
||||||
s.Encode(sig.data() + 32, 32);
|
s.Encode(sig.data() + 32, 32);
|
||||||
sig[64] = recid;
|
|
||||||
|
|
||||||
Public p = dev::recover(sig, he);
|
Public p = dev::recover(sig, he);
|
||||||
BOOST_REQUIRE(p == pkey);
|
BOOST_REQUIRE(p == pkey);
|
||||||
|
|
||||||
// verify w/cryptopp
|
// verify w/cryptopp
|
||||||
BOOST_REQUIRE(crypto::verify(pkey, sig, bytesConstRef(&e)));
|
BOOST_REQUIRE(s_secp256k1.verify(pkey, sig, bytesConstRef(&e)));
|
||||||
|
|
||||||
// verify with secp256k1lib
|
// verify with secp256k1lib
|
||||||
byte encpub[65] = {0x04};
|
byte encpub[65] = {0x04};
|
||||||
@ -166,16 +145,18 @@ BOOST_AUTO_TEST_CASE(cryptopp_cryptopp_secp256k1libport)
|
|||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(cryptopp_ecdsa_sipaseckp256k1)
|
BOOST_AUTO_TEST_CASE(cryptopp_ecdsa_sipaseckp256k1)
|
||||||
{
|
{
|
||||||
|
secp256k1_start();
|
||||||
|
|
||||||
// cryptopp integer encoding
|
// cryptopp integer encoding
|
||||||
Integer nHex("f2ee15ea639b73fa3db9b34a245bdfa015c260c598b211bf05a1ecc4b3e3b4f2H");
|
Integer nHex("f2ee15ea639b73fa3db9b34a245bdfa015c260c598b211bf05a1ecc4b3e3b4f2H");
|
||||||
Integer nB(fromHex("f2ee15ea639b73fa3db9b34a245bdfa015c260c598b211bf05a1ecc4b3e3b4f2").data(), 32);
|
Integer nB(fromHex("f2ee15ea639b73fa3db9b34a245bdfa015c260c598b211bf05a1ecc4b3e3b4f2").data(), 32);
|
||||||
BOOST_REQUIRE(nHex == nB);
|
BOOST_REQUIRE(nHex == nB);
|
||||||
|
|
||||||
bytes sbytes(fromHex("0x01"));
|
bytes sbytes(fromHex("0xFFFF"));
|
||||||
Secret secret(sha3(sbytes)); // 5fe7f977e71dba2ea1a68e21057beebb9be2ac30c6410aa38d4f3fbe41dcffd2
|
Secret secret(sha3(sbytes));
|
||||||
KeyPair key(secret);
|
KeyPair key(secret);
|
||||||
|
|
||||||
bytes m(fromHex("0x01"));
|
bytes m(1, 0xff);
|
||||||
int tests = 2;
|
int tests = 2;
|
||||||
while (m[0]++, tests--)
|
while (m[0]++, tests--)
|
||||||
{
|
{
|
||||||
@ -183,45 +164,45 @@ BOOST_AUTO_TEST_CASE(cryptopp_ecdsa_sipaseckp256k1)
|
|||||||
Integer hInt(hm.asBytes().data(), 32);
|
Integer hInt(hm.asBytes().data(), 32);
|
||||||
h256 k(hm ^ key.sec());
|
h256 k(hm ^ key.sec());
|
||||||
Integer kInt(k.asBytes().data(), 32);
|
Integer kInt(k.asBytes().data(), 32);
|
||||||
|
|
||||||
// raw sign w/cryptopp (doesn't pass through cryptopp hash filter)
|
// raw sign w/cryptopp (doesn't pass through cryptopp hash filter)
|
||||||
ECDSA<ECP, SHA3_256>::Signer signer;
|
ECDSA<ECP, SHA3_256>::Signer signer;
|
||||||
pp::initializeDLScheme(key.sec(), signer);
|
signer.AccessKey().Initialize(s_params, secretToExponent(key.sec()));
|
||||||
Integer r, s;
|
Integer r, s;
|
||||||
signer.RawSign(kInt, hInt, r, s);
|
signer.RawSign(kInt, hInt, r, s);
|
||||||
|
|
||||||
// verify cryptopp raw-signature w/cryptopp
|
// verify cryptopp raw-signature w/cryptopp
|
||||||
ECDSA<ECP, SHA3_256>::Verifier verifier;
|
ECDSA<ECP, SHA3_256>::Verifier verifier;
|
||||||
pp::initializeDLScheme(key.pub(), verifier);
|
verifier.AccessKey().Initialize(s_params, publicToPoint(key.pub()));
|
||||||
Signature sigppraw;
|
Signature sigppraw;
|
||||||
r.Encode(sigppraw.data(), 32);
|
r.Encode(sigppraw.data(), 32);
|
||||||
s.Encode(sigppraw.data() + 32, 32);
|
s.Encode(sigppraw.data() + 32, 32);
|
||||||
BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), sigppraw.data(), 64));
|
BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), sigppraw.data(), 64));
|
||||||
BOOST_REQUIRE(crypto::verify(key.pub(), sigppraw, bytesConstRef(&m)));
|
// BOOST_REQUIRE(crypto::verify(key.pub(), sigppraw, bytesConstRef(&m)));
|
||||||
BOOST_REQUIRE(dev::verify(key.pub(), sigppraw, hm));
|
BOOST_REQUIRE(dev::verify(key.pub(), sigppraw, hm));
|
||||||
|
|
||||||
// sign with cryptopp, verify, recover w/sec256lib
|
// sign with cryptopp, verify, recover w/sec256lib
|
||||||
Signature seclibsig(dev::sign(key.sec(), hm));
|
Signature seclibsig(dev::sign(key.sec(), hm));
|
||||||
BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), seclibsig.data(), 64));
|
BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), seclibsig.data(), 64));
|
||||||
BOOST_REQUIRE(crypto::verify(key.pub(), seclibsig, bytesConstRef(&m)));
|
// BOOST_REQUIRE(crypto::verify(key.pub(), seclibsig, bytesConstRef(&m)));
|
||||||
BOOST_REQUIRE(dev::verify(key.pub(), seclibsig, hm));
|
BOOST_REQUIRE(dev::verify(key.pub(), seclibsig, hm));
|
||||||
BOOST_REQUIRE(dev::recover(seclibsig, hm) == key.pub());
|
BOOST_REQUIRE(dev::recover(seclibsig, hm) == key.pub());
|
||||||
|
|
||||||
// sign with cryptopp (w/hash filter?), verify with cryptopp
|
// sign with cryptopp (w/hash filter?), verify with cryptopp
|
||||||
bytes sigppb(signer.MaxSignatureLength());
|
bytes sigppb(signer.MaxSignatureLength());
|
||||||
size_t ssz = signer.SignMessage(pp::PRNG, m.data(), m.size(), sigppb.data());
|
size_t ssz = signer.SignMessage(s_rng, m.data(), m.size(), sigppb.data());
|
||||||
Signature sigpp;
|
Signature sigpp;
|
||||||
memcpy(sigpp.data(), sigppb.data(), 64);
|
memcpy(sigpp.data(), sigppb.data(), 64);
|
||||||
BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), sigppb.data(), ssz));
|
BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), sigppb.data(), ssz));
|
||||||
BOOST_REQUIRE(crypto::verify(key.pub(), sigpp, bytesConstRef(&m)));
|
// BOOST_REQUIRE(crypto::verify(key.pub(), sigpp, bytesConstRef(&m)));
|
||||||
BOOST_REQUIRE(dev::verify(key.pub(), sigpp, hm));
|
BOOST_REQUIRE(dev::verify(key.pub(), sigpp, hm));
|
||||||
|
|
||||||
// sign with cryptopp and stringsource hash filter
|
// sign with cryptopp and stringsource hash filter
|
||||||
string sigstr;
|
string sigstr;
|
||||||
StringSource ssrc(asString(m), true, new SignerFilter(pp::PRNG, signer, new StringSink(sigstr)));
|
StringSource ssrc(asString(m), true, new SignerFilter(s_rng, signer, new StringSink(sigstr)));
|
||||||
FixedHash<sizeof(Signature)> retsig((byte const*)sigstr.data(), Signature::ConstructFromPointer);
|
FixedHash<sizeof(Signature)> retsig((byte const*)sigstr.data(), Signature::ConstructFromPointer);
|
||||||
BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), retsig.data(), 64));
|
BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), retsig.data(), 64));
|
||||||
BOOST_REQUIRE(crypto::verify(key.pub(), retsig, bytesConstRef(&m)));
|
// BOOST_REQUIRE(crypto::verify(key.pub(), retsig, bytesConstRef(&m)));
|
||||||
BOOST_REQUIRE(dev::verify(key.pub(), retsig, hm));
|
BOOST_REQUIRE(dev::verify(key.pub(), retsig, hm));
|
||||||
|
|
||||||
/// verification w/sec256lib
|
/// verification w/sec256lib
|
||||||
@ -247,37 +228,94 @@ BOOST_AUTO_TEST_CASE(cryptopp_ecdsa_sipaseckp256k1)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(cryptopp_public_export_import)
|
|
||||||
{
|
|
||||||
ECIES<ECP>::Decryptor d(pp::PRNG, pp::secp256k1Curve);
|
|
||||||
ECIES<ECP>::Encryptor e(d.GetKey());
|
|
||||||
|
|
||||||
Secret s;
|
|
||||||
pp::exportPrivateKey(d.GetKey(), s);
|
|
||||||
Public p;
|
|
||||||
pp::exportPublicKey(e.GetKey(), p);
|
|
||||||
Address addr = right160(dev::sha3(p.ref()));
|
|
||||||
BOOST_REQUIRE(toAddress(s) == addr);
|
|
||||||
|
|
||||||
KeyPair l(s);
|
|
||||||
BOOST_REQUIRE(l.address() == addr);
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(ecies_eckeypair)
|
BOOST_AUTO_TEST_CASE(ecies_eckeypair)
|
||||||
{
|
{
|
||||||
KeyPair k = KeyPair::create();
|
KeyPair k = KeyPair::create();
|
||||||
|
|
||||||
string message("Now is the time for all good persons to come to the aide of humanity.");
|
string message("Now is the time for all good persons to come to the aid of humanity.");
|
||||||
string original = message;
|
string original = message;
|
||||||
|
|
||||||
bytes b = asBytes(message);
|
bytes b = asBytes(message);
|
||||||
encrypt(k.pub(), b);
|
s_secp256k1.encrypt(k.pub(), b);
|
||||||
BOOST_REQUIRE(b != asBytes(original));
|
BOOST_REQUIRE(b != asBytes(original));
|
||||||
|
|
||||||
decrypt(k.sec(), b);
|
s_secp256k1.decrypt(k.sec(), b);
|
||||||
BOOST_REQUIRE(b == asBytes(original));
|
BOOST_REQUIRE(b == asBytes(original));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(ecdh)
|
||||||
|
{
|
||||||
|
cnote << "Testing ecdh...";
|
||||||
|
|
||||||
|
ECDH<ECP>::Domain dhLocal(s_curveOID);
|
||||||
|
SecByteBlock privLocal(dhLocal.PrivateKeyLength());
|
||||||
|
SecByteBlock pubLocal(dhLocal.PublicKeyLength());
|
||||||
|
dhLocal.GenerateKeyPair(s_rng, privLocal, pubLocal);
|
||||||
|
|
||||||
|
ECDH<ECP>::Domain dhRemote(s_curveOID);
|
||||||
|
SecByteBlock privRemote(dhRemote.PrivateKeyLength());
|
||||||
|
SecByteBlock pubRemote(dhRemote.PublicKeyLength());
|
||||||
|
dhRemote.GenerateKeyPair(s_rng, privRemote, pubRemote);
|
||||||
|
|
||||||
|
assert(dhLocal.AgreedValueLength() == dhRemote.AgreedValueLength());
|
||||||
|
|
||||||
|
// local: send public to remote; remote: send public to local
|
||||||
|
|
||||||
|
// Local
|
||||||
|
SecByteBlock sharedLocal(dhLocal.AgreedValueLength());
|
||||||
|
assert(dhLocal.Agree(sharedLocal, privLocal, pubRemote));
|
||||||
|
|
||||||
|
// Remote
|
||||||
|
SecByteBlock sharedRemote(dhRemote.AgreedValueLength());
|
||||||
|
assert(dhRemote.Agree(sharedRemote, privRemote, pubLocal));
|
||||||
|
|
||||||
|
// Test
|
||||||
|
Integer ssLocal, ssRemote;
|
||||||
|
ssLocal.Decode(sharedLocal.BytePtr(), sharedLocal.SizeInBytes());
|
||||||
|
ssRemote.Decode(sharedRemote.BytePtr(), sharedRemote.SizeInBytes());
|
||||||
|
|
||||||
|
assert(ssLocal != 0);
|
||||||
|
assert(ssLocal == ssRemote);
|
||||||
|
|
||||||
|
|
||||||
|
// Now use our keys
|
||||||
|
KeyPair a = KeyPair::create();
|
||||||
|
byte puba[65] = {0x04};
|
||||||
|
memcpy(&puba[1], a.pub().data(), 64);
|
||||||
|
|
||||||
|
KeyPair b = KeyPair::create();
|
||||||
|
byte pubb[65] = {0x04};
|
||||||
|
memcpy(&pubb[1], b.pub().data(), 64);
|
||||||
|
|
||||||
|
ECDH<ECP>::Domain dhA(s_curveOID);
|
||||||
|
Secret shared;
|
||||||
|
BOOST_REQUIRE(dhA.Agree(shared.data(), a.sec().data(), pubb));
|
||||||
|
BOOST_REQUIRE(shared);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(ecdhe)
|
||||||
|
{
|
||||||
|
cnote << "Testing ecdhe...";
|
||||||
|
|
||||||
|
ECDHE a, b;
|
||||||
|
BOOST_CHECK_NE(a.pubkey(), b.pubkey());
|
||||||
|
|
||||||
|
ECDHE local;
|
||||||
|
ECDHE remote;
|
||||||
|
|
||||||
|
// local tx pubkey -> remote
|
||||||
|
Secret sremote;
|
||||||
|
remote.agree(local.pubkey(), sremote);
|
||||||
|
|
||||||
|
// remote tx pbukey -> local
|
||||||
|
Secret slocal;
|
||||||
|
local.agree(remote.pubkey(), slocal);
|
||||||
|
|
||||||
|
BOOST_REQUIRE(sremote);
|
||||||
|
BOOST_REQUIRE(slocal);
|
||||||
|
BOOST_REQUIRE_EQUAL(sremote, slocal);
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(ecdhe_aes128_ctr_sha3mac)
|
BOOST_AUTO_TEST_CASE(ecdhe_aes128_ctr_sha3mac)
|
||||||
{
|
{
|
||||||
// New connections require new ECDH keypairs
|
// New connections require new ECDH keypairs
|
||||||
@ -288,53 +326,6 @@ BOOST_AUTO_TEST_CASE(ecdhe_aes128_ctr_sha3mac)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(cryptopp_ecies_message)
|
|
||||||
{
|
|
||||||
cnote << "Testing cryptopp_ecies_message...";
|
|
||||||
|
|
||||||
string const message("Now is the time for all good persons to come to the aide of humanity.");
|
|
||||||
|
|
||||||
ECIES<ECP>::Decryptor localDecryptor(pp::PRNG, pp::secp256k1Curve);
|
|
||||||
SavePrivateKey(localDecryptor.GetPrivateKey());
|
|
||||||
|
|
||||||
ECIES<ECP>::Encryptor localEncryptor(localDecryptor);
|
|
||||||
SavePublicKey(localEncryptor.GetPublicKey());
|
|
||||||
|
|
||||||
ECIES<ECP>::Decryptor futureDecryptor;
|
|
||||||
LoadPrivateKey(futureDecryptor.AccessPrivateKey());
|
|
||||||
futureDecryptor.GetPrivateKey().ThrowIfInvalid(pp::PRNG, 3);
|
|
||||||
|
|
||||||
ECIES<ECP>::Encryptor futureEncryptor;
|
|
||||||
LoadPublicKey(futureEncryptor.AccessPublicKey());
|
|
||||||
futureEncryptor.GetPublicKey().ThrowIfInvalid(pp::PRNG, 3);
|
|
||||||
|
|
||||||
// encrypt/decrypt with local
|
|
||||||
string cipherLocal;
|
|
||||||
StringSource ss1 (message, true, new PK_EncryptorFilter(pp::PRNG, localEncryptor, new StringSink(cipherLocal) ) );
|
|
||||||
string plainLocal;
|
|
||||||
StringSource ss2 (cipherLocal, true, new PK_DecryptorFilter(pp::PRNG, localDecryptor, new StringSink(plainLocal) ) );
|
|
||||||
|
|
||||||
// encrypt/decrypt with future
|
|
||||||
string cipherFuture;
|
|
||||||
StringSource ss3 (message, true, new PK_EncryptorFilter(pp::PRNG, futureEncryptor, new StringSink(cipherFuture) ) );
|
|
||||||
string plainFuture;
|
|
||||||
StringSource ss4 (cipherFuture, true, new PK_DecryptorFilter(pp::PRNG, futureDecryptor, new StringSink(plainFuture) ) );
|
|
||||||
|
|
||||||
// decrypt local w/future
|
|
||||||
string plainFutureFromLocal;
|
|
||||||
StringSource ss5 (cipherLocal, true, new PK_DecryptorFilter(pp::PRNG, futureDecryptor, new StringSink(plainFutureFromLocal) ) );
|
|
||||||
|
|
||||||
// decrypt future w/local
|
|
||||||
string plainLocalFromFuture;
|
|
||||||
StringSource ss6 (cipherFuture, true, new PK_DecryptorFilter(pp::PRNG, localDecryptor, new StringSink(plainLocalFromFuture) ) );
|
|
||||||
|
|
||||||
|
|
||||||
BOOST_REQUIRE(plainLocal == message);
|
|
||||||
BOOST_REQUIRE(plainFuture == plainLocal);
|
|
||||||
BOOST_REQUIRE(plainFutureFromLocal == plainLocal);
|
|
||||||
BOOST_REQUIRE(plainLocalFromFuture == plainLocal);
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
|
BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
|
||||||
{
|
{
|
||||||
const int aesKeyLen = 16;
|
const int aesKeyLen = 16;
|
||||||
@ -346,21 +337,28 @@ BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
|
|||||||
rng.GenerateBlock(key, key.size());
|
rng.GenerateBlock(key, key.size());
|
||||||
|
|
||||||
// cryptopp uses IV as nonce/counter which is same as using nonce w/0 ctr
|
// cryptopp uses IV as nonce/counter which is same as using nonce w/0 ctr
|
||||||
byte ctr[AES::BLOCKSIZE];
|
FixedHash<AES::BLOCKSIZE> ctr;
|
||||||
rng.GenerateBlock(ctr, sizeof(ctr));
|
rng.GenerateBlock(ctr.data(), sizeof(ctr));
|
||||||
|
|
||||||
|
// used for decrypt
|
||||||
|
FixedHash<AES::BLOCKSIZE> ctrcopy(ctr);
|
||||||
|
|
||||||
string text = "Now is the time for all good persons to come to the aide of humanity.";
|
string text = "Now is the time for all good persons to come to the aid of humanity.";
|
||||||
// c++11 ftw
|
|
||||||
unsigned char const* in = (unsigned char*)&text[0];
|
unsigned char const* in = (unsigned char*)&text[0];
|
||||||
unsigned char* out = (unsigned char*)&text[0];
|
unsigned char* out = (unsigned char*)&text[0];
|
||||||
string original = text;
|
string original = text;
|
||||||
|
string doublespeak = text + text;
|
||||||
|
|
||||||
string cipherCopy;
|
string cipherCopy;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
CTR_Mode<AES>::Encryption e;
|
CTR_Mode<AES>::Encryption e;
|
||||||
e.SetKeyWithIV(key, key.size(), ctr);
|
e.SetKeyWithIV(key, key.size(), ctr.data());
|
||||||
|
|
||||||
|
// 68 % 255 should be difference of counter
|
||||||
e.ProcessData(out, in, text.size());
|
e.ProcessData(out, in, text.size());
|
||||||
|
ctr = h128(u128(ctr) + text.size() % 16);
|
||||||
|
|
||||||
BOOST_REQUIRE(text != original);
|
BOOST_REQUIRE(text != original);
|
||||||
cipherCopy = text;
|
cipherCopy = text;
|
||||||
}
|
}
|
||||||
@ -372,7 +370,7 @@ BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
CTR_Mode< AES >::Decryption d;
|
CTR_Mode< AES >::Decryption d;
|
||||||
d.SetKeyWithIV(key, key.size(), ctr);
|
d.SetKeyWithIV(key, key.size(), ctrcopy.data());
|
||||||
d.ProcessData(out, in, text.size());
|
d.ProcessData(out, in, text.size());
|
||||||
BOOST_REQUIRE(text == original);
|
BOOST_REQUIRE(text == original);
|
||||||
}
|
}
|
||||||
@ -390,7 +388,7 @@ BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
|
|||||||
out = (unsigned char*)&cipherCopy[0];
|
out = (unsigned char*)&cipherCopy[0];
|
||||||
|
|
||||||
CTR_Mode<AES>::Encryption e;
|
CTR_Mode<AES>::Encryption e;
|
||||||
e.SetKeyWithIV(key, key.size(), ctr);
|
e.SetKeyWithIV(key, key.size(), ctrcopy.data());
|
||||||
e.ProcessData(out, in, text.size());
|
e.ProcessData(out, in, text.size());
|
||||||
|
|
||||||
// yep, ctr mode.
|
// yep, ctr mode.
|
||||||
|
11
genesis.cpp
11
genesis.cpp
@ -36,6 +36,15 @@ namespace js = json_spirit;
|
|||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE(BasicTests)
|
BOOST_AUTO_TEST_SUITE(BasicTests)
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(emptySHA3Types)
|
||||||
|
{
|
||||||
|
h256 emptyListSHA3(fromHex("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"));
|
||||||
|
BOOST_REQUIRE_EQUAL(emptyListSHA3, EmptyListSHA3);
|
||||||
|
|
||||||
|
h256 emptySHA3(fromHex("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
|
||||||
|
BOOST_REQUIRE_EQUAL(emptySHA3, EmptySHA3);
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(genesis_tests)
|
BOOST_AUTO_TEST_CASE(genesis_tests)
|
||||||
{
|
{
|
||||||
string testPath = test::getTestPath();
|
string testPath = test::getTestPath();
|
||||||
@ -51,7 +60,7 @@ BOOST_AUTO_TEST_CASE(genesis_tests)
|
|||||||
|
|
||||||
BOOST_CHECK_EQUAL(BlockChain::genesis().stateRoot, h256(o["genesis_state_root"].get_str()));
|
BOOST_CHECK_EQUAL(BlockChain::genesis().stateRoot, h256(o["genesis_state_root"].get_str()));
|
||||||
BOOST_CHECK_EQUAL(toHex(BlockChain::createGenesisBlock()), toHex(fromHex(o["genesis_rlp_hex"].get_str())));
|
BOOST_CHECK_EQUAL(toHex(BlockChain::createGenesisBlock()), toHex(fromHex(o["genesis_rlp_hex"].get_str())));
|
||||||
BOOST_CHECK_EQUAL(sha3(BlockChain::createGenesisBlock()), h256(o["genesis_hash"].get_str()));
|
BOOST_CHECK_EQUAL(BlockInfo::headerHash(BlockChain::createGenesisBlock()), h256(o["genesis_hash"].get_str()));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE_END()
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
85
jsonrpc.cpp
85
jsonrpc.cpp
@ -19,7 +19,7 @@
|
|||||||
* @date 2014
|
* @date 2014
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if ETH_JSONRPC
|
#if ETH_JSONRPC && 0
|
||||||
|
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
@ -29,8 +29,9 @@
|
|||||||
#include <libwebthree/WebThree.h>
|
#include <libwebthree/WebThree.h>
|
||||||
#include <libweb3jsonrpc/WebThreeStubServer.h>
|
#include <libweb3jsonrpc/WebThreeStubServer.h>
|
||||||
#include <libweb3jsonrpc/CorsHttpServer.h>
|
#include <libweb3jsonrpc/CorsHttpServer.h>
|
||||||
#include <jsonrpc/connectors/httpserver.h>
|
#include <json/json.h>
|
||||||
#include <jsonrpc/connectors/httpclient.h>
|
#include <jsonrpccpp/server/connectors/httpserver.h>
|
||||||
|
#include <jsonrpccpp/client/connectors/httpclient.h>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include "JsonSpiritHeaders.h"
|
#include "JsonSpiritHeaders.h"
|
||||||
#include "TestHelper.h"
|
#include "TestHelper.h"
|
||||||
@ -43,7 +44,7 @@ using namespace dev;
|
|||||||
using namespace dev::eth;
|
using namespace dev::eth;
|
||||||
namespace js = json_spirit;
|
namespace js = json_spirit;
|
||||||
|
|
||||||
WebThreeDirect *web3;
|
WebThreeDirect* web3;
|
||||||
unique_ptr<WebThreeStubServer> jsonrpcServer;
|
unique_ptr<WebThreeStubServer> jsonrpcServer;
|
||||||
unique_ptr<WebThreeStubClient> jsonrpcClient;
|
unique_ptr<WebThreeStubClient> jsonrpcClient;
|
||||||
|
|
||||||
@ -61,11 +62,12 @@ struct Setup
|
|||||||
|
|
||||||
web3->setIdealPeerCount(5);
|
web3->setIdealPeerCount(5);
|
||||||
web3->ethereum()->setForceMining(true);
|
web3->ethereum()->setForceMining(true);
|
||||||
jsonrpcServer = unique_ptr<WebThreeStubServer>(new WebThreeStubServer(new jsonrpc::CorsHttpServer(8080), *web3, {}));
|
auto server = new jsonrpc::HttpServer(8080);
|
||||||
|
jsonrpcServer = unique_ptr<WebThreeStubServer>(new WebThreeStubServer(*server, *web3, {}));
|
||||||
jsonrpcServer->setIdentities({});
|
jsonrpcServer->setIdentities({});
|
||||||
jsonrpcServer->StartListening();
|
jsonrpcServer->StartListening();
|
||||||
|
auto client = new jsonrpc::HttpClient("http://localhost:8080");
|
||||||
jsonrpcClient = unique_ptr<WebThreeStubClient>(new WebThreeStubClient(new jsonrpc::HttpClient("http://localhost:8080")));
|
jsonrpcClient = unique_ptr<WebThreeStubClient>(new WebThreeStubClient(*client));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -237,7 +239,76 @@ BOOST_AUTO_TEST_CASE(jsonrpc_transact)
|
|||||||
BOOST_CHECK_EQUAL(jsToDecimal(balanceString2), "750000000000000000");
|
BOOST_CHECK_EQUAL(jsToDecimal(balanceString2), "750000000000000000");
|
||||||
BOOST_CHECK_EQUAL(txAmount, balance2);
|
BOOST_CHECK_EQUAL(txAmount, balance2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(simple_contract)
|
||||||
|
{
|
||||||
|
cnote << "Testing jsonrpc contract...";
|
||||||
|
KeyPair kp = KeyPair::create();
|
||||||
|
web3->ethereum()->setAddress(kp.address());
|
||||||
|
jsonrpcServer->setAccounts({kp});
|
||||||
|
|
||||||
|
dev::eth::mine(*(web3->ethereum()), 1);
|
||||||
|
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function f(uint a) returns(uint d) { return a * 7; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
string compiled = jsonrpcClient->eth_solidity(sourceCode);
|
||||||
|
|
||||||
|
Json::Value create;
|
||||||
|
create["code"] = compiled;
|
||||||
|
string contractAddress = jsonrpcClient->eth_transact(create);
|
||||||
|
dev::eth::mine(*(web3->ethereum()), 1);
|
||||||
|
|
||||||
|
Json::Value call;
|
||||||
|
call["to"] = contractAddress;
|
||||||
|
call["data"] = "0x00000000000000000000000000000000000000000000000000000000000000001";
|
||||||
|
string result = jsonrpcClient->eth_call(call);
|
||||||
|
BOOST_CHECK_EQUAL(result, "0x0000000000000000000000000000000000000000000000000000000000000007");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(contract_storage)
|
||||||
|
{
|
||||||
|
cnote << "Testing jsonrpc contract storage...";
|
||||||
|
KeyPair kp = KeyPair::create();
|
||||||
|
web3->ethereum()->setAddress(kp.address());
|
||||||
|
jsonrpcServer->setAccounts({kp});
|
||||||
|
|
||||||
|
dev::eth::mine(*(web3->ethereum()), 1);
|
||||||
|
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract test {
|
||||||
|
uint hello;
|
||||||
|
function writeHello(uint value) returns(bool d){
|
||||||
|
hello = value;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)";
|
||||||
|
|
||||||
|
string compiled = jsonrpcClient->eth_solidity(sourceCode);
|
||||||
|
|
||||||
|
Json::Value create;
|
||||||
|
create["code"] = compiled;
|
||||||
|
string contractAddress = jsonrpcClient->eth_transact(create);
|
||||||
|
dev::eth::mine(*(web3->ethereum()), 1);
|
||||||
|
|
||||||
|
Json::Value transact;
|
||||||
|
transact["to"] = contractAddress;
|
||||||
|
transact["data"] = "0x00000000000000000000000000000000000000000000000000000000000000003";
|
||||||
|
jsonrpcClient->eth_transact(transact);
|
||||||
|
dev::eth::mine(*(web3->ethereum()), 1);
|
||||||
|
|
||||||
|
Json::Value storage = jsonrpcClient->eth_storageAt(contractAddress);
|
||||||
|
BOOST_CHECK_EQUAL(storage.getMemberNames().size(), 1);
|
||||||
|
// bracers are required, cause msvc couldnt handle this macro in for statement
|
||||||
|
for (auto name: storage.getMemberNames())
|
||||||
|
{
|
||||||
|
BOOST_CHECK_EQUAL(storage[name].asString(), "0x03");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE_END()
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
BOOST_AUTO_TEST_SUITE_END()
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
|
||||||
|
@ -46,16 +46,23 @@ namespace
|
|||||||
bytes compileContract(const string& _sourceCode)
|
bytes compileContract(const string& _sourceCode)
|
||||||
{
|
{
|
||||||
Parser parser;
|
Parser parser;
|
||||||
ASTPointer<ContractDefinition> contract;
|
ASTPointer<SourceUnit> sourceUnit;
|
||||||
BOOST_REQUIRE_NO_THROW(contract = parser.parse(make_shared<Scanner>(CharStream(_sourceCode))));
|
BOOST_REQUIRE_NO_THROW(sourceUnit = parser.parse(make_shared<Scanner>(CharStream(_sourceCode))));
|
||||||
NameAndTypeResolver resolver;
|
NameAndTypeResolver resolver({});
|
||||||
BOOST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*contract));
|
resolver.registerDeclarations(*sourceUnit);
|
||||||
|
for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
|
||||||
|
if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
|
||||||
|
{
|
||||||
|
BOOST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*contract));
|
||||||
|
|
||||||
Compiler compiler;
|
Compiler compiler;
|
||||||
compiler.compileContract(*contract);
|
compiler.compileContract(*contract, {});
|
||||||
// debug
|
// debug
|
||||||
//compiler.streamAssembly(cout);
|
//compiler.streamAssembly(cout);
|
||||||
return compiler.getAssembledBytecode();
|
return compiler.getAssembledBytecode();
|
||||||
|
}
|
||||||
|
BOOST_FAIL("No contract found in source.");
|
||||||
|
return bytes();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Checks that @a _compiledCode is present starting from offset @a _offset in @a _expectation.
|
/// Checks that @a _compiledCode is present starting from offset @a _offset in @a _expectation.
|
||||||
@ -80,7 +87,7 @@ BOOST_AUTO_TEST_CASE(smoke_test)
|
|||||||
"}\n";
|
"}\n";
|
||||||
bytes code = compileContract(sourceCode);
|
bytes code = compileContract(sourceCode);
|
||||||
|
|
||||||
unsigned boilerplateSize = 51;
|
unsigned boilerplateSize = 40;
|
||||||
bytes expectation({byte(Instruction::JUMPDEST),
|
bytes expectation({byte(Instruction::JUMPDEST),
|
||||||
byte(Instruction::PUSH1), 0x0, // initialize local variable x
|
byte(Instruction::PUSH1), 0x0, // initialize local variable x
|
||||||
byte(Instruction::PUSH1), 0x2,
|
byte(Instruction::PUSH1), 0x2,
|
||||||
@ -100,8 +107,8 @@ BOOST_AUTO_TEST_CASE(different_argument_numbers)
|
|||||||
"}\n";
|
"}\n";
|
||||||
bytes code = compileContract(sourceCode);
|
bytes code = compileContract(sourceCode);
|
||||||
|
|
||||||
unsigned shift = 75;
|
unsigned shift = 68;
|
||||||
unsigned boilerplateSize = 88;
|
unsigned boilerplateSize = 81;
|
||||||
bytes expectation({byte(Instruction::JUMPDEST),
|
bytes expectation({byte(Instruction::JUMPDEST),
|
||||||
byte(Instruction::PUSH1), 0x0, // initialize return variable d
|
byte(Instruction::PUSH1), 0x0, // initialize return variable d
|
||||||
byte(Instruction::DUP3),
|
byte(Instruction::DUP3),
|
||||||
@ -118,8 +125,8 @@ BOOST_AUTO_TEST_CASE(different_argument_numbers)
|
|||||||
byte(Instruction::JUMP), // end of f
|
byte(Instruction::JUMP), // end of f
|
||||||
byte(Instruction::JUMPDEST), // beginning of g
|
byte(Instruction::JUMPDEST), // beginning of g
|
||||||
byte(Instruction::PUSH1), 0x0,
|
byte(Instruction::PUSH1), 0x0,
|
||||||
byte(Instruction::DUP1), // initialized e and h
|
byte(Instruction::PUSH1), 0x0, // initialized e and h
|
||||||
byte(Instruction::PUSH1), byte(0x29 + shift), // ret address
|
byte(Instruction::PUSH1), byte(0x2a + shift), // ret address
|
||||||
byte(Instruction::PUSH1), 0x1, byte(Instruction::PUSH1), 0xff, byte(Instruction::AND),
|
byte(Instruction::PUSH1), 0x1, byte(Instruction::PUSH1), 0xff, byte(Instruction::AND),
|
||||||
byte(Instruction::PUSH1), 0x2, byte(Instruction::PUSH1), 0xff, byte(Instruction::AND),
|
byte(Instruction::PUSH1), 0x2, byte(Instruction::PUSH1), 0xff, byte(Instruction::AND),
|
||||||
byte(Instruction::PUSH1), 0x3, byte(Instruction::PUSH1), 0xff, byte(Instruction::AND),
|
byte(Instruction::PUSH1), 0x3, byte(Instruction::PUSH1), 0xff, byte(Instruction::AND),
|
||||||
@ -128,8 +135,6 @@ BOOST_AUTO_TEST_CASE(different_argument_numbers)
|
|||||||
byte(Instruction::JUMP),
|
byte(Instruction::JUMP),
|
||||||
byte(Instruction::JUMPDEST),
|
byte(Instruction::JUMPDEST),
|
||||||
// stack here: ret e h f(1,2,3)
|
// stack here: ret e h f(1,2,3)
|
||||||
byte(Instruction::DUP2),
|
|
||||||
byte(Instruction::POP),
|
|
||||||
byte(Instruction::SWAP1),
|
byte(Instruction::SWAP1),
|
||||||
// stack here: ret e f(1,2,3) h
|
// stack here: ret e f(1,2,3) h
|
||||||
byte(Instruction::POP),
|
byte(Instruction::POP),
|
||||||
@ -153,8 +158,8 @@ BOOST_AUTO_TEST_CASE(ifStatement)
|
|||||||
"}\n";
|
"}\n";
|
||||||
bytes code = compileContract(sourceCode);
|
bytes code = compileContract(sourceCode);
|
||||||
|
|
||||||
unsigned shift = 38;
|
unsigned shift = 27;
|
||||||
unsigned boilerplateSize = 51;
|
unsigned boilerplateSize = 40;
|
||||||
bytes expectation({byte(Instruction::JUMPDEST),
|
bytes expectation({byte(Instruction::JUMPDEST),
|
||||||
byte(Instruction::PUSH1), 0x0,
|
byte(Instruction::PUSH1), 0x0,
|
||||||
byte(Instruction::DUP1),
|
byte(Instruction::DUP1),
|
||||||
@ -195,8 +200,8 @@ BOOST_AUTO_TEST_CASE(loops)
|
|||||||
"}\n";
|
"}\n";
|
||||||
bytes code = compileContract(sourceCode);
|
bytes code = compileContract(sourceCode);
|
||||||
|
|
||||||
unsigned shift = 38;
|
unsigned shift = 27;
|
||||||
unsigned boilerplateSize = 51;
|
unsigned boilerplateSize = 40;
|
||||||
bytes expectation({byte(Instruction::JUMPDEST),
|
bytes expectation({byte(Instruction::JUMPDEST),
|
||||||
byte(Instruction::JUMPDEST),
|
byte(Instruction::JUMPDEST),
|
||||||
byte(Instruction::PUSH1), 0x1,
|
byte(Instruction::PUSH1), 0x1,
|
||||||
|
@ -22,10 +22,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <tuple>
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <libethereum/State.h>
|
#include <libdevcrypto/SHA3.h>
|
||||||
#include <libethereum/Executive.h>
|
#include <test/solidityExecutionFramework.h>
|
||||||
#include <libsolidity/CompilerStack.h>
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
@ -36,74 +36,6 @@ namespace solidity
|
|||||||
namespace test
|
namespace test
|
||||||
{
|
{
|
||||||
|
|
||||||
class ExecutionFramework
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
ExecutionFramework() { g_logVerbosity = 0; }
|
|
||||||
|
|
||||||
bytes const& compileAndRun(std::string const& _sourceCode)
|
|
||||||
{
|
|
||||||
bytes code = dev::solidity::CompilerStack::compile(_sourceCode);
|
|
||||||
sendMessage(code, true);
|
|
||||||
BOOST_REQUIRE(!m_output.empty());
|
|
||||||
return m_output;
|
|
||||||
}
|
|
||||||
|
|
||||||
bytes const& callFunction(byte _index, bytes const& _data)
|
|
||||||
{
|
|
||||||
sendMessage(bytes(1, _index) + _data, false);
|
|
||||||
return m_output;
|
|
||||||
}
|
|
||||||
|
|
||||||
bytes const& callFunction(byte _index, u256 const& _argument1)
|
|
||||||
{
|
|
||||||
return callFunction(_index, toBigEndian(_argument1));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool testSolidityAgainstCpp(byte _index, std::function<u256(u256)> const& _cppfun, u256 const& _argument1)
|
|
||||||
{
|
|
||||||
return toBigEndian(_cppfun(_argument1)) == callFunction(_index, toBigEndian(_argument1));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool testSolidityAgainstCpp(byte _index, std::function<u256()> const& _cppfun)
|
|
||||||
{
|
|
||||||
return toBigEndian(_cppfun()) == callFunction(_index, bytes());
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
void sendMessage(bytes const& _data, bool _isCreation)
|
|
||||||
{
|
|
||||||
eth::Executive executive(m_state);
|
|
||||||
eth::Transaction t = _isCreation ? eth::Transaction(0, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec())
|
|
||||||
: eth::Transaction(0, m_gasPrice, m_gas, m_contractAddress, _data, 0, KeyPair::create().sec());
|
|
||||||
bytes transactionRLP = t.rlp();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// this will throw since the transaction is invalid, but it should nevertheless store the transaction
|
|
||||||
executive.setup(&transactionRLP);
|
|
||||||
}
|
|
||||||
catch (...) {}
|
|
||||||
if (_isCreation)
|
|
||||||
{
|
|
||||||
BOOST_REQUIRE(!executive.create(Address(), 0, m_gasPrice, m_gas, &_data, Address()));
|
|
||||||
m_contractAddress = executive.newAddress();
|
|
||||||
BOOST_REQUIRE(m_contractAddress);
|
|
||||||
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
BOOST_REQUIRE(!executive.call(m_contractAddress, Address(), 0, m_gasPrice, &_data, m_gas, Address()));
|
|
||||||
BOOST_REQUIRE(executive.go());
|
|
||||||
executive.finalize();
|
|
||||||
m_output = executive.out().toVector();
|
|
||||||
}
|
|
||||||
|
|
||||||
Address m_contractAddress;
|
|
||||||
eth::State m_state;
|
|
||||||
u256 const m_gasPrice = 100 * eth::szabo;
|
|
||||||
u256 const m_gas = 1000000;
|
|
||||||
bytes m_output;
|
|
||||||
};
|
|
||||||
|
|
||||||
BOOST_FIXTURE_TEST_SUITE(SolidityCompilerEndToEndTest, ExecutionFramework)
|
BOOST_FIXTURE_TEST_SUITE(SolidityCompilerEndToEndTest, ExecutionFramework)
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(smoke_test)
|
BOOST_AUTO_TEST_CASE(smoke_test)
|
||||||
@ -112,8 +44,7 @@ BOOST_AUTO_TEST_CASE(smoke_test)
|
|||||||
" function f(uint a) returns(uint d) { return a * 7; }\n"
|
" function f(uint a) returns(uint d) { return a * 7; }\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
compileAndRun(sourceCode);
|
compileAndRun(sourceCode);
|
||||||
u256 a = 0x200030004;
|
testSolidityAgainstCppOnRange(0, [](u256 const& a) -> u256 { return a * 7; }, 0, 100);
|
||||||
BOOST_CHECK(callFunction(0, a) == toBigEndian(a * 7));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(empty_contract)
|
BOOST_AUTO_TEST_CASE(empty_contract)
|
||||||
@ -121,7 +52,7 @@ BOOST_AUTO_TEST_CASE(empty_contract)
|
|||||||
char const* sourceCode = "contract test {\n"
|
char const* sourceCode = "contract test {\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
compileAndRun(sourceCode);
|
compileAndRun(sourceCode);
|
||||||
BOOST_CHECK(callFunction(0, bytes()).empty());
|
BOOST_CHECK(callContractFunction(0, bytes()).empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(recursive_calls)
|
BOOST_AUTO_TEST_CASE(recursive_calls)
|
||||||
@ -133,7 +64,7 @@ BOOST_AUTO_TEST_CASE(recursive_calls)
|
|||||||
" }\n"
|
" }\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
compileAndRun(sourceCode);
|
compileAndRun(sourceCode);
|
||||||
std::function<u256(u256)> recursive_calls_cpp = [&recursive_calls_cpp](u256 const& n) -> u256
|
function<u256(u256)> recursive_calls_cpp = [&recursive_calls_cpp](u256 const& n) -> u256
|
||||||
{
|
{
|
||||||
if (n <= 1)
|
if (n <= 1)
|
||||||
return 1;
|
return 1;
|
||||||
@ -141,11 +72,23 @@ BOOST_AUTO_TEST_CASE(recursive_calls)
|
|||||||
return n * recursive_calls_cpp(n - 1);
|
return n * recursive_calls_cpp(n - 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, recursive_calls_cpp, u256(0)));
|
testSolidityAgainstCppOnRange(0, recursive_calls_cpp, 0, 5);
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, recursive_calls_cpp, u256(1)));
|
}
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, recursive_calls_cpp, u256(2)));
|
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, recursive_calls_cpp, u256(3)));
|
BOOST_AUTO_TEST_CASE(multiple_functions)
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, recursive_calls_cpp, u256(4)));
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function a() returns(uint n) { return 0; }\n"
|
||||||
|
" function b() returns(uint n) { return 1; }\n"
|
||||||
|
" function c() returns(uint n) { return 2; }\n"
|
||||||
|
" function f() returns(uint n) { return 3; }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes()) == toBigEndian(u256(0)));
|
||||||
|
BOOST_CHECK(callContractFunction(1, bytes()) == toBigEndian(u256(1)));
|
||||||
|
BOOST_CHECK(callContractFunction(2, bytes()) == toBigEndian(u256(2)));
|
||||||
|
BOOST_CHECK(callContractFunction(3, bytes()) == toBigEndian(u256(3)));
|
||||||
|
BOOST_CHECK(callContractFunction(4, bytes()) == bytes());
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(while_loop)
|
BOOST_AUTO_TEST_CASE(while_loop)
|
||||||
@ -169,11 +112,7 @@ BOOST_AUTO_TEST_CASE(while_loop)
|
|||||||
return nfac;
|
return nfac;
|
||||||
};
|
};
|
||||||
|
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, while_loop_cpp, u256(0)));
|
testSolidityAgainstCppOnRange(0, while_loop_cpp, 0, 5);
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, while_loop_cpp, u256(1)));
|
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, while_loop_cpp, u256(2)));
|
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, while_loop_cpp, u256(3)));
|
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, while_loop_cpp, u256(4)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(break_outside_loop)
|
BOOST_AUTO_TEST_CASE(break_outside_loop)
|
||||||
@ -184,9 +123,8 @@ BOOST_AUTO_TEST_CASE(break_outside_loop)
|
|||||||
" break; continue; return 2;\n"
|
" break; continue; return 2;\n"
|
||||||
" }\n"
|
" }\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
ExecutionFramework framework;
|
compileAndRun(sourceCode);
|
||||||
framework.compileAndRun(sourceCode);
|
testSolidityAgainstCpp(0, [](u256 const&) -> u256 { return 2; }, u256(0));
|
||||||
BOOST_CHECK(framework.callFunction(0, u256(0)) == toBigEndian(u256(2)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(nested_loops)
|
BOOST_AUTO_TEST_CASE(nested_loops)
|
||||||
@ -209,8 +147,7 @@ BOOST_AUTO_TEST_CASE(nested_loops)
|
|||||||
" return x;\n"
|
" return x;\n"
|
||||||
" }\n"
|
" }\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
ExecutionFramework framework;
|
compileAndRun(sourceCode);
|
||||||
framework.compileAndRun(sourceCode);
|
|
||||||
|
|
||||||
auto nested_loops_cpp = [](u256 n) -> u256
|
auto nested_loops_cpp = [](u256 n) -> u256
|
||||||
{
|
{
|
||||||
@ -236,18 +173,7 @@ BOOST_AUTO_TEST_CASE(nested_loops)
|
|||||||
return n;
|
return n;
|
||||||
};
|
};
|
||||||
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(0)));
|
testSolidityAgainstCppOnRange(0, nested_loops_cpp, 0, 12);
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(1)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(2)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(3)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(4)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(5)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(6)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(7)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(8)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(9)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(10)));
|
|
||||||
BOOST_CHECK(framework.testSolidityAgainstCpp(0, nested_loops_cpp, u256(11)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(calling_other_functions)
|
BOOST_AUTO_TEST_CASE(calling_other_functions)
|
||||||
@ -279,7 +205,8 @@ BOOST_AUTO_TEST_CASE(calling_other_functions)
|
|||||||
return 3 * n + 1;
|
return 3 * n + 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
auto collatz_cpp = [&evenStep_cpp, &oddStep_cpp] (u256 n) -> u256 {
|
auto collatz_cpp = [&evenStep_cpp, &oddStep_cpp](u256 n) -> u256
|
||||||
|
{
|
||||||
u256 y;
|
u256 y;
|
||||||
while ((y = n) > 1)
|
while ((y = n) > 1)
|
||||||
{
|
{
|
||||||
@ -291,11 +218,11 @@ BOOST_AUTO_TEST_CASE(calling_other_functions)
|
|||||||
return y;
|
return y;
|
||||||
};
|
};
|
||||||
|
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(2, collatz_cpp, u256(0)));
|
testSolidityAgainstCpp(2, collatz_cpp, u256(0));
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(2, collatz_cpp, u256(1)));
|
testSolidityAgainstCpp(2, collatz_cpp, u256(1));
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(2, collatz_cpp, u256(2)));
|
testSolidityAgainstCpp(2, collatz_cpp, u256(2));
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(2, collatz_cpp, u256(8)));
|
testSolidityAgainstCpp(2, collatz_cpp, u256(8));
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(2, collatz_cpp, u256(127)));
|
testSolidityAgainstCpp(2, collatz_cpp, u256(127));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(many_local_variables)
|
BOOST_AUTO_TEST_CASE(many_local_variables)
|
||||||
@ -308,8 +235,15 @@ BOOST_AUTO_TEST_CASE(many_local_variables)
|
|||||||
" }\n"
|
" }\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
compileAndRun(sourceCode);
|
compileAndRun(sourceCode);
|
||||||
BOOST_CHECK(callFunction(0, toBigEndian(u256(0x1000)) + toBigEndian(u256(0x10000)) + toBigEndian(u256(0x100000)))
|
auto f = [](u256 const& x1, u256 const& x2, u256 const& x3) -> u256
|
||||||
== toBigEndian(u256(0x121121)));
|
{
|
||||||
|
u256 a = 0x1;
|
||||||
|
u256 b = 0x10;
|
||||||
|
u256 c = 0x100;
|
||||||
|
u256 y = a + b + c + x1 + x2 + x3;
|
||||||
|
return y + b + x2;
|
||||||
|
};
|
||||||
|
testSolidityAgainstCpp(0, f, u256(0x1000), u256(0x10000), u256(0x100000));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(packing_unpacking_types)
|
BOOST_AUTO_TEST_CASE(packing_unpacking_types)
|
||||||
@ -322,7 +256,7 @@ BOOST_AUTO_TEST_CASE(packing_unpacking_types)
|
|||||||
" }\n"
|
" }\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
compileAndRun(sourceCode);
|
compileAndRun(sourceCode);
|
||||||
BOOST_CHECK(callFunction(0, fromHex("01""0f0f0f0f""f0f0f0f0f0f0f0f0"))
|
BOOST_CHECK(callContractFunction(0, fromHex("01""0f0f0f0f""f0f0f0f0f0f0f0f0"))
|
||||||
== fromHex("00000000000000000000000000000000000000""01""f0f0f0f0""0f0f0f0f0f0f0f0f"));
|
== fromHex("00000000000000000000000000000000000000""01""f0f0f0f0""0f0f0f0f0f0f0f0f"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -334,7 +268,7 @@ BOOST_AUTO_TEST_CASE(multiple_return_values)
|
|||||||
" }\n"
|
" }\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
compileAndRun(sourceCode);
|
compileAndRun(sourceCode);
|
||||||
BOOST_CHECK(callFunction(0, bytes(1, 1) + toBigEndian(u256(0xcd)))
|
BOOST_CHECK(callContractFunction(0, bytes(1, 1) + toBigEndian(u256(0xcd)))
|
||||||
== toBigEndian(u256(0xcd)) + bytes(1, 1) + toBigEndian(u256(0)));
|
== toBigEndian(u256(0xcd)) + bytes(1, 1) + toBigEndian(u256(0)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -354,8 +288,7 @@ BOOST_AUTO_TEST_CASE(short_circuiting)
|
|||||||
return n;
|
return n;
|
||||||
};
|
};
|
||||||
|
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, short_circuiting_cpp, u256(0)));
|
testSolidityAgainstCppOnRange(0, short_circuiting_cpp, 0, 2);
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, short_circuiting_cpp, u256(1)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(high_bits_cleaning)
|
BOOST_AUTO_TEST_CASE(high_bits_cleaning)
|
||||||
@ -375,7 +308,7 @@ BOOST_AUTO_TEST_CASE(high_bits_cleaning)
|
|||||||
return 0;
|
return 0;
|
||||||
return x;
|
return x;
|
||||||
};
|
};
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, high_bits_cleaning_cpp));
|
testSolidityAgainstCpp(0, high_bits_cleaning_cpp);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(sign_extension)
|
BOOST_AUTO_TEST_CASE(sign_extension)
|
||||||
@ -395,7 +328,7 @@ BOOST_AUTO_TEST_CASE(sign_extension)
|
|||||||
return 0;
|
return 0;
|
||||||
return u256(x) * -1;
|
return u256(x) * -1;
|
||||||
};
|
};
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, sign_extension_cpp));
|
testSolidityAgainstCpp(0, sign_extension_cpp);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(small_unsigned_types)
|
BOOST_AUTO_TEST_CASE(small_unsigned_types)
|
||||||
@ -412,7 +345,7 @@ BOOST_AUTO_TEST_CASE(small_unsigned_types)
|
|||||||
uint32_t x = uint32_t(0xffffff) * 0xffffff;
|
uint32_t x = uint32_t(0xffffff) * 0xffffff;
|
||||||
return x / 0x100;
|
return x / 0x100;
|
||||||
};
|
};
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, small_unsigned_types_cpp));
|
testSolidityAgainstCpp(0, small_unsigned_types_cpp);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(small_signed_types)
|
BOOST_AUTO_TEST_CASE(small_signed_types)
|
||||||
@ -427,7 +360,49 @@ BOOST_AUTO_TEST_CASE(small_signed_types)
|
|||||||
{
|
{
|
||||||
return -int32_t(10) * -int64_t(20);
|
return -int32_t(10) * -int64_t(20);
|
||||||
};
|
};
|
||||||
BOOST_CHECK(testSolidityAgainstCpp(0, small_signed_types_cpp));
|
testSolidityAgainstCpp(0, small_signed_types_cpp);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(strings)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function fixed() returns(string32 ret) {\n"
|
||||||
|
" return \"abc\\x00\\xff__\";\n"
|
||||||
|
" }\n"
|
||||||
|
" function pipeThrough(string2 small, bool one) returns(string16 large, bool oneRet) {\n"
|
||||||
|
" oneRet = one;\n"
|
||||||
|
" large = small;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
bytes expectation(32, 0);
|
||||||
|
expectation[0] = byte('a');
|
||||||
|
expectation[1] = byte('b');
|
||||||
|
expectation[2] = byte('c');
|
||||||
|
expectation[3] = byte(0);
|
||||||
|
expectation[4] = byte(0xff);
|
||||||
|
expectation[5] = byte('_');
|
||||||
|
expectation[6] = byte('_');
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes()) == expectation);
|
||||||
|
expectation = bytes(17, 0);
|
||||||
|
expectation[0] = 0;
|
||||||
|
expectation[1] = 2;
|
||||||
|
expectation[16] = 1;
|
||||||
|
BOOST_CHECK(callContractFunction(1, bytes({0x00, 0x02, 0x01})) == expectation);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(empty_string_on_stack)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function run(string0 empty, uint8 inp) returns(uint16 a, string0 b, string4 c) {\n"
|
||||||
|
" var x = \"abc\";\n"
|
||||||
|
" var y = \"\";\n"
|
||||||
|
" var z = inp;\n"
|
||||||
|
" a = z; b = y; c = x;"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes({0x02})) == bytes({0x00, 0x02, (byte)'a', (byte)'b', (byte)'c', 0x00}));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(state_smoke_test)
|
BOOST_AUTO_TEST_CASE(state_smoke_test)
|
||||||
@ -445,14 +420,596 @@ BOOST_AUTO_TEST_CASE(state_smoke_test)
|
|||||||
" }\n"
|
" }\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
compileAndRun(sourceCode);
|
compileAndRun(sourceCode);
|
||||||
BOOST_CHECK(callFunction(0, bytes(1, 0x00)) == toBigEndian(u256(0)));
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x00)) == toBigEndian(u256(0)));
|
||||||
BOOST_CHECK(callFunction(0, bytes(1, 0x01)) == toBigEndian(u256(0)));
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x01)) == toBigEndian(u256(0)));
|
||||||
BOOST_CHECK(callFunction(1, bytes(1, 0x00) + toBigEndian(u256(0x1234))) == bytes());
|
BOOST_CHECK(callContractFunction(1, bytes(1, 0x00) + toBigEndian(u256(0x1234))) == bytes());
|
||||||
BOOST_CHECK(callFunction(1, bytes(1, 0x01) + toBigEndian(u256(0x8765))) == bytes());
|
BOOST_CHECK(callContractFunction(1, bytes(1, 0x01) + toBigEndian(u256(0x8765))) == bytes());
|
||||||
BOOST_CHECK(callFunction(0, bytes(1, 0x00)) == toBigEndian(u256(0x1234)));
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x00)) == toBigEndian(u256(0x1234)));
|
||||||
BOOST_CHECK(callFunction(0, bytes(1, 0x01)) == toBigEndian(u256(0x8765)));
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x01)) == toBigEndian(u256(0x8765)));
|
||||||
BOOST_CHECK(callFunction(1, bytes(1, 0x00) + toBigEndian(u256(0x3))) == bytes());
|
BOOST_CHECK(callContractFunction(1, bytes(1, 0x00) + toBigEndian(u256(0x3))) == bytes());
|
||||||
BOOST_CHECK(callFunction(0, bytes(1, 0x00)) == toBigEndian(u256(0x3)));
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x00)) == toBigEndian(u256(0x3)));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(simple_mapping)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" mapping(uint8 => uint8) table;\n"
|
||||||
|
" function get(uint8 k) returns (uint8 v) {\n"
|
||||||
|
" return table[k];\n"
|
||||||
|
" }\n"
|
||||||
|
" function set(uint8 k, uint8 v) {\n"
|
||||||
|
" table[k] = v;\n"
|
||||||
|
" }\n"
|
||||||
|
"}";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
|
||||||
|
// msvc seems to have problems with initializer-list, when there is only 1 param in the list
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x00)) == bytes(1, 0x00));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x01)) == bytes(1, 0x00));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0xa7)) == bytes(1, 0x00));
|
||||||
|
callContractFunction(1, bytes({0x01, 0xa1}));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x00)) == bytes(1, 0x00));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x01)) == bytes(1, 0xa1));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0xa7)) == bytes(1, 0x00));
|
||||||
|
callContractFunction(1, bytes({0x00, 0xef}));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x00)) == bytes(1, 0xef));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x01)) == bytes(1, 0xa1));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0xa7)) == bytes(1, 0x00));
|
||||||
|
callContractFunction(1, bytes({0x01, 0x05}));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x00)) == bytes(1, 0xef));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0x01)) == bytes(1, 0x05));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes(1, 0xa7)) == bytes(1, 0x00));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(mapping_state)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract Ballot {\n"
|
||||||
|
" mapping(address => bool) canVote;\n"
|
||||||
|
" mapping(address => uint) voteCount;\n"
|
||||||
|
" mapping(address => bool) voted;\n"
|
||||||
|
" function getVoteCount(address addr) returns (uint retVoteCount) {\n"
|
||||||
|
" return voteCount[addr];\n"
|
||||||
|
" }\n"
|
||||||
|
" function grantVoteRight(address addr) {\n"
|
||||||
|
" canVote[addr] = true;\n"
|
||||||
|
" }\n"
|
||||||
|
" function vote(address voter, address vote) returns (bool success) {\n"
|
||||||
|
" if (!canVote[voter] || voted[voter]) return false;\n"
|
||||||
|
" voted[voter] = true;\n"
|
||||||
|
" voteCount[vote] = voteCount[vote] + 1;\n"
|
||||||
|
" return true;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
class Ballot
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
u256 getVoteCount(u160 _address) { return m_voteCount[_address]; }
|
||||||
|
void grantVoteRight(u160 _address) { m_canVote[_address] = true; }
|
||||||
|
bool vote(u160 _voter, u160 _vote)
|
||||||
|
{
|
||||||
|
if (!m_canVote[_voter] || m_voted[_voter]) return false;
|
||||||
|
m_voted[_voter] = true;
|
||||||
|
m_voteCount[_vote]++;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
map<u160, bool> m_canVote;
|
||||||
|
map<u160, u256> m_voteCount;
|
||||||
|
map<u160, bool> m_voted;
|
||||||
|
} ballot;
|
||||||
|
|
||||||
|
auto getVoteCount = bind(&Ballot::getVoteCount, &ballot, _1);
|
||||||
|
auto grantVoteRight = bind(&Ballot::grantVoteRight, &ballot, _1);
|
||||||
|
auto vote = bind(&Ballot::vote, &ballot, _1, _2);
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(0));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(1));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(2));
|
||||||
|
// voting without vote right shourd be rejected
|
||||||
|
testSolidityAgainstCpp(2, vote, u160(0), u160(2));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(0));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(1));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(2));
|
||||||
|
// grant vote rights
|
||||||
|
testSolidityAgainstCpp(1, grantVoteRight, u160(0));
|
||||||
|
testSolidityAgainstCpp(1, grantVoteRight, u160(1));
|
||||||
|
// vote, should increase 2's vote count
|
||||||
|
testSolidityAgainstCpp(2, vote, u160(0), u160(2));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(0));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(1));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(2));
|
||||||
|
// vote again, should be rejected
|
||||||
|
testSolidityAgainstCpp(2, vote, u160(0), u160(1));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(0));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(1));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(2));
|
||||||
|
// vote without right to vote
|
||||||
|
testSolidityAgainstCpp(2, vote, u160(2), u160(1));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(0));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(1));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(2));
|
||||||
|
// grant vote right and now vote again
|
||||||
|
testSolidityAgainstCpp(1, grantVoteRight, u160(2));
|
||||||
|
testSolidityAgainstCpp(2, vote, u160(2), u160(1));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(0));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(1));
|
||||||
|
testSolidityAgainstCpp(0, getVoteCount, u160(2));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(mapping_state_inc_dec)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" uint value;\n"
|
||||||
|
" mapping(uint => uint) table;\n"
|
||||||
|
" function f(uint x) returns (uint y) {\n"
|
||||||
|
" value = x;\n"
|
||||||
|
" if (x > 0) table[++value] = 8;\n"
|
||||||
|
" if (x > 1) value--;\n"
|
||||||
|
" if (x > 2) table[value]++;\n"
|
||||||
|
" return --table[value++];\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
|
||||||
|
u256 value = 0;
|
||||||
|
map<u256, u256> table;
|
||||||
|
auto f = [&](u256 const& _x) -> u256
|
||||||
|
{
|
||||||
|
value = _x;
|
||||||
|
if (_x > 0)
|
||||||
|
table[++value] = 8;
|
||||||
|
if (_x > 1)
|
||||||
|
value --;
|
||||||
|
if (_x > 2)
|
||||||
|
table[value]++;
|
||||||
|
return --table[value++];
|
||||||
|
};
|
||||||
|
testSolidityAgainstCppOnRange(0, f, 0, 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(multi_level_mapping)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" mapping(uint => mapping(uint => uint)) table;\n"
|
||||||
|
" function f(uint x, uint y, uint z) returns (uint w) {\n"
|
||||||
|
" if (z == 0) return table[x][y];\n"
|
||||||
|
" else return table[x][y] = z;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
|
||||||
|
map<u256, map<u256, u256>> table;
|
||||||
|
auto f = [&](u256 const& _x, u256 const& _y, u256 const& _z) -> u256
|
||||||
|
{
|
||||||
|
if (_z == 0) return table[_x][_y];
|
||||||
|
else return table[_x][_y] = _z;
|
||||||
|
};
|
||||||
|
testSolidityAgainstCpp(0, f, u256(4), u256(5), u256(0));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(5), u256(4), u256(0));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(4), u256(5), u256(9));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(4), u256(5), u256(0));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(5), u256(4), u256(0));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(5), u256(4), u256(7));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(4), u256(5), u256(0));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(5), u256(4), u256(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(structs)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" struct s1 {\n"
|
||||||
|
" uint8 x;\n"
|
||||||
|
" bool y;\n"
|
||||||
|
" }\n"
|
||||||
|
" struct s2 {\n"
|
||||||
|
" uint32 z;\n"
|
||||||
|
" s1 s1data;\n"
|
||||||
|
" mapping(uint8 => s2) recursive;\n"
|
||||||
|
" }\n"
|
||||||
|
" s2 data;\n"
|
||||||
|
" function check() returns (bool ok) {\n"
|
||||||
|
" return data.z == 1 && data.s1data.x == 2 && \n"
|
||||||
|
" data.s1data.y == true && \n"
|
||||||
|
" data.recursive[3].recursive[4].z == 5 && \n"
|
||||||
|
" data.recursive[4].recursive[3].z == 6 && \n"
|
||||||
|
" data.recursive[0].s1data.y == false && \n"
|
||||||
|
" data.recursive[4].z == 9;\n"
|
||||||
|
" }\n"
|
||||||
|
" function set() {\n"
|
||||||
|
" data.z = 1;\n"
|
||||||
|
" data.s1data.x = 2;\n"
|
||||||
|
" data.s1data.y = true;\n"
|
||||||
|
" data.recursive[3].recursive[4].z = 5;\n"
|
||||||
|
" data.recursive[4].recursive[3].z = 6;\n"
|
||||||
|
" data.recursive[0].s1data.y = false;\n"
|
||||||
|
" data.recursive[4].z = 9;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
BOOST_CHECK(callContractFunction(0) == bytes(1, 0x00));
|
||||||
|
BOOST_CHECK(callContractFunction(1) == bytes());
|
||||||
|
BOOST_CHECK(callContractFunction(0) == bytes(1, 0x01));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(struct_reference)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" struct s2 {\n"
|
||||||
|
" uint32 z;\n"
|
||||||
|
" mapping(uint8 => s2) recursive;\n"
|
||||||
|
" }\n"
|
||||||
|
" s2 data;\n"
|
||||||
|
" function check() returns (bool ok) {\n"
|
||||||
|
" return data.z == 2 && \n"
|
||||||
|
" data.recursive[0].z == 3 && \n"
|
||||||
|
" data.recursive[0].recursive[1].z == 0 && \n"
|
||||||
|
" data.recursive[0].recursive[0].z == 1;\n"
|
||||||
|
" }\n"
|
||||||
|
" function set() {\n"
|
||||||
|
" data.z = 2;\n"
|
||||||
|
" var map = data.recursive;\n"
|
||||||
|
" s2 inner = map[0];\n"
|
||||||
|
" inner.z = 3;\n"
|
||||||
|
" inner.recursive[0].z = inner.recursive[1].z + 1;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
BOOST_CHECK(callContractFunction(0) == bytes(1, 0x00));
|
||||||
|
BOOST_CHECK(callContractFunction(1) == bytes());
|
||||||
|
BOOST_CHECK(callContractFunction(0) == bytes(1, 0x01));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(constructor)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" mapping(uint => uint) data;\n"
|
||||||
|
" function test() {\n"
|
||||||
|
" data[7] = 8;\n"
|
||||||
|
" }\n"
|
||||||
|
" function get(uint key) returns (uint value) {\n"
|
||||||
|
" return data[key];"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
map<u256, byte> data;
|
||||||
|
data[7] = 8;
|
||||||
|
auto get = [&](u256 const& _x) -> u256
|
||||||
|
{
|
||||||
|
return data[_x];
|
||||||
|
};
|
||||||
|
testSolidityAgainstCpp(0, get, u256(6));
|
||||||
|
testSolidityAgainstCpp(0, get, u256(7));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(balance)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function getBalance() returns (uint256 balance) {\n"
|
||||||
|
" return address(this).balance;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode, 23);
|
||||||
|
BOOST_CHECK(callContractFunction(0) == toBigEndian(u256(23)));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(blockchain)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function someInfo() returns (uint256 value, address coinbase, uint256 blockNumber) {\n"
|
||||||
|
" value = msg.value;\n"
|
||||||
|
" coinbase = block.coinbase;\n"
|
||||||
|
" blockNumber = block.number;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode, 27);
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes{0}, u256(28)) == toBigEndian(u256(28)) + bytes(20, 0) + toBigEndian(u256(1)));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(function_types)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function a(bool selector) returns (uint b) {\n"
|
||||||
|
" var f = fun1;\n"
|
||||||
|
" if (selector) f = fun2;\n"
|
||||||
|
" return f(9);\n"
|
||||||
|
" }\n"
|
||||||
|
" function fun1(uint x) returns (uint b) {\n"
|
||||||
|
" return 11;\n"
|
||||||
|
" }\n"
|
||||||
|
" function fun2(uint x) returns (uint b) {\n"
|
||||||
|
" return 12;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes{0}) == toBigEndian(u256(11)));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes{1}) == toBigEndian(u256(12)));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(send_ether)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function a(address addr, uint amount) returns (uint ret) {\n"
|
||||||
|
" addr.send(amount);\n"
|
||||||
|
" return address(this).balance;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
u256 amount(130);
|
||||||
|
compileAndRun(sourceCode, amount + 1);
|
||||||
|
u160 address(23);
|
||||||
|
BOOST_CHECK(callContractFunction(0, address, amount) == toBigEndian(u256(1)));
|
||||||
|
BOOST_CHECK_EQUAL(m_state.balance(address), amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(suicide)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function a(address receiver) returns (uint ret) {\n"
|
||||||
|
" suicide(receiver);\n"
|
||||||
|
" return 10;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
u256 amount(130);
|
||||||
|
compileAndRun(sourceCode, amount);
|
||||||
|
u160 address(23);
|
||||||
|
BOOST_CHECK(callContractFunction(0, address) == bytes());
|
||||||
|
BOOST_CHECK(!m_state.addressHasCode(m_contractAddress));
|
||||||
|
BOOST_CHECK_EQUAL(m_state.balance(address), amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(sha3)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function a(hash input) returns (hash sha3hash) {\n"
|
||||||
|
" return sha3(input);\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
auto f = [&](u256 const& _x) -> u256
|
||||||
|
{
|
||||||
|
return dev::sha3(toBigEndian(_x));
|
||||||
|
};
|
||||||
|
testSolidityAgainstCpp(0, f, u256(4));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(5));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(-1));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(sha256)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function a(hash input) returns (hash sha256hash) {\n"
|
||||||
|
" return sha256(input);\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
auto f = [&](u256 const& _input) -> u256
|
||||||
|
{
|
||||||
|
h256 ret;
|
||||||
|
dev::sha256(dev::ref(toBigEndian(_input)), bytesRef(&ret[0], 32));
|
||||||
|
return ret;
|
||||||
|
};
|
||||||
|
testSolidityAgainstCpp(0, f, u256(4));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(5));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(-1));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(ripemd)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function a(hash input) returns (hash sha256hash) {\n"
|
||||||
|
" return ripemd160(input);\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
auto f = [&](u256 const& _input) -> u256
|
||||||
|
{
|
||||||
|
h256 ret;
|
||||||
|
dev::ripemd160(dev::ref(toBigEndian(_input)), bytesRef(&ret[0], 32));
|
||||||
|
return u256(ret) >> (256 - 160);
|
||||||
|
};
|
||||||
|
testSolidityAgainstCpp(0, f, u256(4));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(5));
|
||||||
|
testSolidityAgainstCpp(0, f, u256(-1));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(ecrecover)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function a(hash h, uint8 v, hash r, hash s) returns (address addr) {\n"
|
||||||
|
" return ecrecover(h, v, r, s);\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
compileAndRun(sourceCode);
|
||||||
|
u256 h("0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c");
|
||||||
|
byte v = 28;
|
||||||
|
u256 r("0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f");
|
||||||
|
u256 s("0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549");
|
||||||
|
u160 addr("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b");
|
||||||
|
BOOST_CHECK(callContractFunction(0, h, v, r, s) == toBigEndian(addr));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(inter_contract_calls)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract Helper {
|
||||||
|
function multiply(uint a, uint b) returns (uint c) {
|
||||||
|
return a * b;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contract Main {
|
||||||
|
Helper h;
|
||||||
|
function callHelper(uint a, uint b) returns (uint c) {
|
||||||
|
return h.multiply(a, b);
|
||||||
|
}
|
||||||
|
function getHelper() returns (address haddress) {
|
||||||
|
return address(h);
|
||||||
|
}
|
||||||
|
function setHelper(address haddress) {
|
||||||
|
h = Helper(haddress);
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileAndRun(sourceCode, 0, "Helper");
|
||||||
|
u160 const helperAddress = m_contractAddress;
|
||||||
|
compileAndRun(sourceCode, 0, "Main");
|
||||||
|
BOOST_REQUIRE(callContractFunction(2, helperAddress) == bytes());
|
||||||
|
BOOST_REQUIRE(callContractFunction(1, helperAddress) == toBigEndian(helperAddress));
|
||||||
|
u256 a(3456789);
|
||||||
|
u256 b("0x282837623374623234aa74");
|
||||||
|
BOOST_REQUIRE(callContractFunction(0, a, b) == toBigEndian(a * b));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(inter_contract_calls_with_complex_parameters)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract Helper {
|
||||||
|
function sel(uint a, bool select, uint b) returns (uint c) {
|
||||||
|
if (select) return a; else return b;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contract Main {
|
||||||
|
Helper h;
|
||||||
|
function callHelper(uint a, bool select, uint b) returns (uint c) {
|
||||||
|
return h.sel(a, select, b) * 3;
|
||||||
|
}
|
||||||
|
function getHelper() returns (address haddress) {
|
||||||
|
return address(h);
|
||||||
|
}
|
||||||
|
function setHelper(address haddress) {
|
||||||
|
h = Helper(haddress);
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileAndRun(sourceCode, 0, "Helper");
|
||||||
|
u160 const helperAddress = m_contractAddress;
|
||||||
|
compileAndRun(sourceCode, 0, "Main");
|
||||||
|
BOOST_REQUIRE(callContractFunction(2, helperAddress) == bytes());
|
||||||
|
BOOST_REQUIRE(callContractFunction(1, helperAddress) == toBigEndian(helperAddress));
|
||||||
|
u256 a(3456789);
|
||||||
|
u256 b("0x282837623374623234aa74");
|
||||||
|
BOOST_REQUIRE(callContractFunction(0, a, true, b) == toBigEndian(a * 3));
|
||||||
|
BOOST_REQUIRE(callContractFunction(0, a, false, b) == toBigEndian(b * 3));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(inter_contract_calls_accessing_this)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract Helper {
|
||||||
|
function getAddress() returns (address addr) {
|
||||||
|
return address(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contract Main {
|
||||||
|
Helper h;
|
||||||
|
function callHelper() returns (address addr) {
|
||||||
|
return h.getAddress();
|
||||||
|
}
|
||||||
|
function getHelper() returns (address addr) {
|
||||||
|
return address(h);
|
||||||
|
}
|
||||||
|
function setHelper(address addr) {
|
||||||
|
h = Helper(addr);
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileAndRun(sourceCode, 0, "Helper");
|
||||||
|
u160 const helperAddress = m_contractAddress;
|
||||||
|
compileAndRun(sourceCode, 0, "Main");
|
||||||
|
BOOST_REQUIRE(callContractFunction(2, helperAddress) == bytes());
|
||||||
|
BOOST_REQUIRE(callContractFunction(1, helperAddress) == toBigEndian(helperAddress));
|
||||||
|
BOOST_REQUIRE(callContractFunction(0) == toBigEndian(helperAddress));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(calls_to_this)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract Helper {
|
||||||
|
function invoke(uint a, uint b) returns (uint c) {
|
||||||
|
return this.multiply(a, b, 10);
|
||||||
|
}
|
||||||
|
function multiply(uint a, uint b, uint8 c) returns (uint ret) {
|
||||||
|
return a * b + c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contract Main {
|
||||||
|
Helper h;
|
||||||
|
function callHelper(uint a, uint b) returns (uint ret) {
|
||||||
|
return h.invoke(a, b);
|
||||||
|
}
|
||||||
|
function getHelper() returns (address addr) {
|
||||||
|
return address(h);
|
||||||
|
}
|
||||||
|
function setHelper(address addr) {
|
||||||
|
h = Helper(addr);
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileAndRun(sourceCode, 0, "Helper");
|
||||||
|
u160 const helperAddress = m_contractAddress;
|
||||||
|
compileAndRun(sourceCode, 0, "Main");
|
||||||
|
BOOST_REQUIRE(callContractFunction(2, helperAddress) == bytes());
|
||||||
|
BOOST_REQUIRE(callContractFunction(1, helperAddress) == toBigEndian(helperAddress));
|
||||||
|
u256 a(3456789);
|
||||||
|
u256 b("0x282837623374623234aa74");
|
||||||
|
BOOST_REQUIRE(callContractFunction(0, a, b) == toBigEndian(a * b + 10));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(inter_contract_calls_with_local_vars)
|
||||||
|
{
|
||||||
|
// note that a reference to another contract's function occupies two stack slots,
|
||||||
|
// so this tests correct stack slot allocation
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract Helper {
|
||||||
|
function multiply(uint a, uint b) returns (uint c) {
|
||||||
|
return a * b;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contract Main {
|
||||||
|
Helper h;
|
||||||
|
function callHelper(uint a, uint b) returns (uint c) {
|
||||||
|
var fu = h.multiply;
|
||||||
|
var y = 9;
|
||||||
|
var ret = fu(a, b);
|
||||||
|
return ret + y;
|
||||||
|
}
|
||||||
|
function getHelper() returns (address haddress) {
|
||||||
|
return address(h);
|
||||||
|
}
|
||||||
|
function setHelper(address haddress) {
|
||||||
|
h = Helper(haddress);
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileAndRun(sourceCode, 0, "Helper");
|
||||||
|
u160 const helperAddress = m_contractAddress;
|
||||||
|
compileAndRun(sourceCode, 0, "Main");
|
||||||
|
BOOST_REQUIRE(callContractFunction(2, helperAddress) == bytes());
|
||||||
|
BOOST_REQUIRE(callContractFunction(1, helperAddress) == toBigEndian(helperAddress));
|
||||||
|
u256 a(3456789);
|
||||||
|
u256 b("0x282837623374623234aa74");
|
||||||
|
BOOST_REQUIRE(callContractFunction(0, a, b) == toBigEndian(a * b + 9));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(strings_in_calls)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract Helper {
|
||||||
|
function invoke(string3 x, bool stop) returns (string4 ret) {
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contract Main {
|
||||||
|
Helper h;
|
||||||
|
function callHelper(string2 x, bool stop) returns (string5 ret) {
|
||||||
|
return h.invoke(x, stop);
|
||||||
|
}
|
||||||
|
function getHelper() returns (address addr) {
|
||||||
|
return address(h);
|
||||||
|
}
|
||||||
|
function setHelper(address addr) {
|
||||||
|
h = Helper(addr);
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileAndRun(sourceCode, 0, "Helper");
|
||||||
|
u160 const helperAddress = m_contractAddress;
|
||||||
|
compileAndRun(sourceCode, 0, "Main");
|
||||||
|
BOOST_REQUIRE(callContractFunction(2, helperAddress) == bytes());
|
||||||
|
BOOST_REQUIRE(callContractFunction(1, helperAddress) == toBigEndian(helperAddress));
|
||||||
|
BOOST_CHECK(callContractFunction(0, bytes({0, 'a', 1})) == bytes({0, 'a', 0, 0, 0}));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE_END()
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
161
solidityExecutionFramework.h
Normal file
161
solidityExecutionFramework.h
Normal file
@ -0,0 +1,161 @@
|
|||||||
|
|
||||||
|
/*
|
||||||
|
This file is part of cpp-ethereum.
|
||||||
|
|
||||||
|
cpp-ethereum is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
cpp-ethereum is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* @author Christian <c@ethdev.com>
|
||||||
|
* @date 2014
|
||||||
|
* Framework for executing Solidity contracts and testing them against C++ implementation.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <tuple>
|
||||||
|
#include <boost/test/unit_test.hpp>
|
||||||
|
#include <libethereum/State.h>
|
||||||
|
#include <libethereum/Executive.h>
|
||||||
|
#include <libsolidity/CompilerStack.h>
|
||||||
|
|
||||||
|
namespace dev
|
||||||
|
{
|
||||||
|
/// Provides additional overloads for toBigEndian to encode arguments and return values.
|
||||||
|
inline bytes toBigEndian(byte _value) { return bytes({_value}); }
|
||||||
|
inline bytes toBigEndian(bool _value) { return bytes({byte(_value)}); }
|
||||||
|
|
||||||
|
namespace solidity
|
||||||
|
{
|
||||||
|
namespace test
|
||||||
|
{
|
||||||
|
|
||||||
|
class ExecutionFramework
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
ExecutionFramework() { g_logVerbosity = 0; }
|
||||||
|
|
||||||
|
bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "")
|
||||||
|
{
|
||||||
|
dev::solidity::CompilerStack compiler;
|
||||||
|
compiler.compile(_sourceCode, m_optimize);
|
||||||
|
bytes code = compiler.getBytecode(_contractName);
|
||||||
|
sendMessage(code, true, _value);
|
||||||
|
BOOST_REQUIRE(!m_output.empty());
|
||||||
|
return m_output;
|
||||||
|
}
|
||||||
|
|
||||||
|
bytes const& callContractFunction(byte _index, bytes const& _data = bytes(), u256 const& _value = 0)
|
||||||
|
{
|
||||||
|
sendMessage(bytes(1, _index) + _data, false, _value);
|
||||||
|
return m_output;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <class... Args>
|
||||||
|
bytes const& callContractFunction(byte _index, Args const&... _arguments)
|
||||||
|
{
|
||||||
|
return callContractFunction(_index, argsToBigEndian(_arguments...));
|
||||||
|
}
|
||||||
|
|
||||||
|
template <class CppFunction, class... Args>
|
||||||
|
void testSolidityAgainstCpp(byte _index, CppFunction const& _cppFunction, Args const&... _arguments)
|
||||||
|
{
|
||||||
|
bytes solidityResult = callContractFunction(_index, _arguments...);
|
||||||
|
bytes cppResult = callCppAndEncodeResult(_cppFunction, _arguments...);
|
||||||
|
BOOST_CHECK_MESSAGE(solidityResult == cppResult, "Computed values do not match."
|
||||||
|
"\nSolidity: " + toHex(solidityResult) + "\nC++: " + toHex(cppResult));
|
||||||
|
}
|
||||||
|
|
||||||
|
template <class CppFunction, class... Args>
|
||||||
|
void testSolidityAgainstCppOnRange(byte _index, CppFunction const& _cppFunction,
|
||||||
|
u256 const& _rangeStart, u256 const& _rangeEnd)
|
||||||
|
{
|
||||||
|
for (u256 argument = _rangeStart; argument < _rangeEnd; ++argument)
|
||||||
|
{
|
||||||
|
bytes solidityResult = callContractFunction(_index, argument);
|
||||||
|
bytes cppResult = callCppAndEncodeResult(_cppFunction, argument);
|
||||||
|
BOOST_CHECK_MESSAGE(solidityResult == cppResult, "Computed values do not match."
|
||||||
|
"\nSolidity: " + toHex(solidityResult) + "\nC++: " + toHex(cppResult) +
|
||||||
|
"\nArgument: " + toHex(toBigEndian(argument)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
template <class FirstArg, class... Args>
|
||||||
|
bytes argsToBigEndian(FirstArg const& _firstArg, Args const&... _followingArgs) const
|
||||||
|
{
|
||||||
|
return toBigEndian(_firstArg) + argsToBigEndian(_followingArgs...);
|
||||||
|
}
|
||||||
|
|
||||||
|
bytes argsToBigEndian() const { return bytes(); }
|
||||||
|
|
||||||
|
template <class CppFunction, class... Args>
|
||||||
|
auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
|
||||||
|
-> typename std::enable_if<std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
|
||||||
|
{
|
||||||
|
_cppFunction(_arguments...);
|
||||||
|
return bytes();
|
||||||
|
}
|
||||||
|
template <class CppFunction, class... Args>
|
||||||
|
auto callCppAndEncodeResult(CppFunction const& _cppFunction, Args const&... _arguments)
|
||||||
|
-> typename std::enable_if<!std::is_void<decltype(_cppFunction(_arguments...))>::value, bytes>::type
|
||||||
|
{
|
||||||
|
return toBigEndian(_cppFunction(_arguments...));
|
||||||
|
}
|
||||||
|
|
||||||
|
void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0)
|
||||||
|
{
|
||||||
|
m_state.addBalance(m_sender, _value); // just in case
|
||||||
|
eth::Executive executive(m_state, 0);
|
||||||
|
eth::Transaction t = _isCreation ? eth::Transaction(_value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec())
|
||||||
|
: eth::Transaction(_value, m_gasPrice, m_gas, m_contractAddress, _data, 0, KeyPair::create().sec());
|
||||||
|
bytes transactionRLP = t.rlp();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// this will throw since the transaction is invalid, but it should nevertheless store the transaction
|
||||||
|
executive.setup(&transactionRLP);
|
||||||
|
}
|
||||||
|
catch (...) {}
|
||||||
|
if (_isCreation)
|
||||||
|
{
|
||||||
|
BOOST_REQUIRE(!executive.create(m_sender, _value, m_gasPrice, m_gas, &_data, m_sender));
|
||||||
|
m_contractAddress = executive.newAddress();
|
||||||
|
BOOST_REQUIRE(m_contractAddress);
|
||||||
|
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
|
||||||
|
BOOST_REQUIRE(!executive.call(m_contractAddress, m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas, m_sender));
|
||||||
|
}
|
||||||
|
BOOST_REQUIRE(executive.go());
|
||||||
|
m_state.noteSending(m_sender);
|
||||||
|
executive.finalize();
|
||||||
|
m_output = executive.out().toVector();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
bool m_optimize = false;
|
||||||
|
Address m_sender;
|
||||||
|
Address m_contractAddress;
|
||||||
|
eth::State m_state;
|
||||||
|
u256 const m_gasPrice = 100 * eth::szabo;
|
||||||
|
u256 const m_gas = 1000000;
|
||||||
|
bytes m_output;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} // end namespaces
|
||||||
|
|
@ -76,8 +76,11 @@ Declaration const& resolveDeclaration(vector<string> const& _namespacedName,
|
|||||||
NameAndTypeResolver const& _resolver)
|
NameAndTypeResolver const& _resolver)
|
||||||
{
|
{
|
||||||
Declaration const* declaration = nullptr;
|
Declaration const* declaration = nullptr;
|
||||||
|
// bracers are required, cause msvc couldnt handle this macro in for statement
|
||||||
for (string const& namePart: _namespacedName)
|
for (string const& namePart: _namespacedName)
|
||||||
|
{
|
||||||
BOOST_REQUIRE(declaration = _resolver.resolveName(namePart, declaration));
|
BOOST_REQUIRE(declaration = _resolver.resolveName(namePart, declaration));
|
||||||
|
}
|
||||||
BOOST_REQUIRE(declaration);
|
BOOST_REQUIRE(declaration);
|
||||||
return *declaration;
|
return *declaration;
|
||||||
}
|
}
|
||||||
@ -86,27 +89,34 @@ bytes compileFirstExpression(const string& _sourceCode, vector<vector<string>> _
|
|||||||
vector<vector<string>> _localVariables = {})
|
vector<vector<string>> _localVariables = {})
|
||||||
{
|
{
|
||||||
Parser parser;
|
Parser parser;
|
||||||
ASTPointer<ContractDefinition> contract;
|
ASTPointer<SourceUnit> sourceUnit;
|
||||||
BOOST_REQUIRE_NO_THROW(contract = parser.parse(make_shared<Scanner>(CharStream(_sourceCode))));
|
BOOST_REQUIRE_NO_THROW(sourceUnit = parser.parse(make_shared<Scanner>(CharStream(_sourceCode))));
|
||||||
NameAndTypeResolver resolver;
|
NameAndTypeResolver resolver({});
|
||||||
BOOST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*contract));
|
resolver.registerDeclarations(*sourceUnit);
|
||||||
FirstExpressionExtractor extractor(*contract);
|
for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
|
||||||
BOOST_REQUIRE(extractor.getExpression() != nullptr);
|
if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
|
||||||
|
{
|
||||||
|
BOOST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*contract));
|
||||||
|
FirstExpressionExtractor extractor(*contract);
|
||||||
|
BOOST_REQUIRE(extractor.getExpression() != nullptr);
|
||||||
|
|
||||||
CompilerContext context;
|
CompilerContext context;
|
||||||
for (vector<string> const& function: _functions)
|
for (vector<string> const& function: _functions)
|
||||||
context.addFunction(dynamic_cast<FunctionDefinition const&>(resolveDeclaration(function, resolver)));
|
context.addFunction(dynamic_cast<FunctionDefinition const&>(resolveDeclaration(function, resolver)));
|
||||||
for (vector<string> const& variable: _localVariables)
|
for (vector<string> const& variable: _localVariables)
|
||||||
context.addVariable(dynamic_cast<VariableDeclaration const&>(resolveDeclaration(variable, resolver)));
|
context.addVariable(dynamic_cast<VariableDeclaration const&>(resolveDeclaration(variable, resolver)));
|
||||||
|
|
||||||
ExpressionCompiler::compileExpression(context, *extractor.getExpression());
|
ExpressionCompiler::compileExpression(context, *extractor.getExpression());
|
||||||
|
|
||||||
for (vector<string> const& function: _functions)
|
for (vector<string> const& function: _functions)
|
||||||
context << context.getFunctionEntryLabel(dynamic_cast<FunctionDefinition const&>(resolveDeclaration(function, resolver)));
|
context << context.getFunctionEntryLabel(dynamic_cast<FunctionDefinition const&>(resolveDeclaration(function, resolver)));
|
||||||
bytes instructions = context.getAssembledBytecode();
|
bytes instructions = context.getAssembledBytecode();
|
||||||
// debug
|
// debug
|
||||||
// cout << eth::disassemble(instructions) << endl;
|
// cout << eth::disassemble(instructions) << endl;
|
||||||
return instructions;
|
return instructions;
|
||||||
|
}
|
||||||
|
BOOST_FAIL("No contract found in source.");
|
||||||
|
return bytes();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // end anonymous namespace
|
} // end anonymous namespace
|
||||||
|
229
solidityJSONInterfaceTest.cpp
Normal file
229
solidityJSONInterfaceTest.cpp
Normal file
@ -0,0 +1,229 @@
|
|||||||
|
/*
|
||||||
|
This file is part of cpp-ethereum.
|
||||||
|
|
||||||
|
cpp-ethereum is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
cpp-ethereum is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* @author Marek Kotewicz <marek@ethdev.com>
|
||||||
|
* @date 2014
|
||||||
|
* Unit tests for the solidity compiler JSON Interface output.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <boost/test/unit_test.hpp>
|
||||||
|
#include <libsolidity/CompilerStack.h>
|
||||||
|
#include <jsoncpp/json/json.h>
|
||||||
|
#include <libdevcore/Exceptions.h>
|
||||||
|
|
||||||
|
namespace dev
|
||||||
|
{
|
||||||
|
namespace solidity
|
||||||
|
{
|
||||||
|
namespace test
|
||||||
|
{
|
||||||
|
|
||||||
|
class InterfaceChecker
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
void checkInterface(std::string const& _code, std::string const& _expectedInterfaceString)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
m_compilerStack.parse(_code);
|
||||||
|
}
|
||||||
|
catch (const std::exception& e)
|
||||||
|
{
|
||||||
|
std::string const* extra = boost::get_error_info<errinfo_comment>(e);
|
||||||
|
std::string msg = std::string("Parsing contract failed with: ") +
|
||||||
|
e.what() + std::string("\n");
|
||||||
|
if (extra)
|
||||||
|
msg += *extra;
|
||||||
|
BOOST_FAIL(msg);
|
||||||
|
}
|
||||||
|
std::string generatedInterfaceString = m_compilerStack.getJsonDocumentation("", DocumentationType::ABI_INTERFACE);
|
||||||
|
Json::Value generatedInterface;
|
||||||
|
m_reader.parse(generatedInterfaceString, generatedInterface);
|
||||||
|
Json::Value expectedInterface;
|
||||||
|
m_reader.parse(_expectedInterfaceString, expectedInterface);
|
||||||
|
BOOST_CHECK_MESSAGE(expectedInterface == generatedInterface,
|
||||||
|
"Expected " << _expectedInterfaceString <<
|
||||||
|
"\n but got:\n" << generatedInterfaceString);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
CompilerStack m_compilerStack;
|
||||||
|
Json::Reader m_reader;
|
||||||
|
};
|
||||||
|
|
||||||
|
BOOST_FIXTURE_TEST_SUITE(SolidityABIJSON, InterfaceChecker)
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(basic_test)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function f(uint a) returns(uint d) { return a * 7; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* interface = R"([
|
||||||
|
{
|
||||||
|
"name": "f",
|
||||||
|
"inputs": [
|
||||||
|
{
|
||||||
|
"name": "a",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outputs": [
|
||||||
|
{
|
||||||
|
"name": "d",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
])";
|
||||||
|
|
||||||
|
checkInterface(sourceCode, interface);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(empty_contract)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* interface = "[]";
|
||||||
|
|
||||||
|
checkInterface(sourceCode, interface);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(multiple_methods)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function f(uint a) returns(uint d) { return a * 7; }\n"
|
||||||
|
" function g(uint b) returns(uint e) { return b * 8; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* interface = R"([
|
||||||
|
{
|
||||||
|
"name": "f",
|
||||||
|
"inputs": [
|
||||||
|
{
|
||||||
|
"name": "a",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outputs": [
|
||||||
|
{
|
||||||
|
"name": "d",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "g",
|
||||||
|
"inputs": [
|
||||||
|
{
|
||||||
|
"name": "b",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outputs": [
|
||||||
|
{
|
||||||
|
"name": "e",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
])";
|
||||||
|
|
||||||
|
checkInterface(sourceCode, interface);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(multiple_params)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function f(uint a, uint b) returns(uint d) { return a + b; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* interface = R"([
|
||||||
|
{
|
||||||
|
"name": "f",
|
||||||
|
"inputs": [
|
||||||
|
{
|
||||||
|
"name": "a",
|
||||||
|
"type": "uint256"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "b",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outputs": [
|
||||||
|
{
|
||||||
|
"name": "d",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
])";
|
||||||
|
|
||||||
|
checkInterface(sourceCode, interface);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(multiple_methods_order)
|
||||||
|
{
|
||||||
|
// methods are expected to be in alpabetical order
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function f(uint a) returns(uint d) { return a * 7; }\n"
|
||||||
|
" function c(uint b) returns(uint e) { return b * 8; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* interface = R"([
|
||||||
|
{
|
||||||
|
"name": "c",
|
||||||
|
"inputs": [
|
||||||
|
{
|
||||||
|
"name": "b",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outputs": [
|
||||||
|
{
|
||||||
|
"name": "e",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "f",
|
||||||
|
"inputs": [
|
||||||
|
{
|
||||||
|
"name": "a",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outputs": [
|
||||||
|
{
|
||||||
|
"name": "d",
|
||||||
|
"type": "uint256"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
])";
|
||||||
|
|
||||||
|
checkInterface(sourceCode, interface);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -41,10 +41,12 @@ namespace
|
|||||||
void parseTextAndResolveNames(std::string const& _source)
|
void parseTextAndResolveNames(std::string const& _source)
|
||||||
{
|
{
|
||||||
Parser parser;
|
Parser parser;
|
||||||
ASTPointer<ContractDefinition> contract = parser.parse(
|
ASTPointer<SourceUnit> sourceUnit = parser.parse(std::make_shared<Scanner>(CharStream(_source)));
|
||||||
std::make_shared<Scanner>(CharStream(_source)));
|
NameAndTypeResolver resolver({});
|
||||||
NameAndTypeResolver resolver;
|
resolver.registerDeclarations(*sourceUnit);
|
||||||
resolver.resolveNamesAndTypes(*contract);
|
for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
|
||||||
|
if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
|
||||||
|
resolver.resolveNamesAndTypes(*contract);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,6 +123,44 @@ BOOST_AUTO_TEST_CASE(reference_to_later_declaration)
|
|||||||
BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
|
BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(struct_definition_directly_recursive)
|
||||||
|
{
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" struct MyStructName {\n"
|
||||||
|
" address addr;\n"
|
||||||
|
" MyStructName x;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_THROW(parseTextAndResolveNames(text), ParserError);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(struct_definition_indirectly_recursive)
|
||||||
|
{
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" struct MyStructName1 {\n"
|
||||||
|
" address addr;\n"
|
||||||
|
" uint256 count;\n"
|
||||||
|
" MyStructName2 x;\n"
|
||||||
|
" }\n"
|
||||||
|
" struct MyStructName2 {\n"
|
||||||
|
" MyStructName1 x;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_THROW(parseTextAndResolveNames(text), ParserError);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(struct_definition_recursion_via_mapping)
|
||||||
|
{
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" struct MyStructName1 {\n"
|
||||||
|
" address addr;\n"
|
||||||
|
" uint256 count;\n"
|
||||||
|
" mapping(uint => MyStructName1) x;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(type_inference_smoke_test)
|
BOOST_AUTO_TEST_CASE(type_inference_smoke_test)
|
||||||
{
|
{
|
||||||
char const* text = "contract test {\n"
|
char const* text = "contract test {\n"
|
||||||
@ -186,6 +226,64 @@ BOOST_AUTO_TEST_CASE(type_inference_explicit_conversion)
|
|||||||
BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
|
BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(large_string_literal)
|
||||||
|
{
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" function f() { var x = \"123456789012345678901234567890123\"; }"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(balance)
|
||||||
|
{
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" function fun() {\n"
|
||||||
|
" uint256 x = address(0).balance;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(balance_invalid)
|
||||||
|
{
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" function fun() {\n"
|
||||||
|
" address(0).balance = 7;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(assignment_to_mapping)
|
||||||
|
{
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" struct str {\n"
|
||||||
|
" mapping(uint=>uint) map;\n"
|
||||||
|
" }\n"
|
||||||
|
" str data;"
|
||||||
|
" function fun() {\n"
|
||||||
|
" var a = data.map;\n"
|
||||||
|
" data.map = a;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(assignment_to_struct)
|
||||||
|
{
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" struct str {\n"
|
||||||
|
" mapping(uint=>uint) map;\n"
|
||||||
|
" }\n"
|
||||||
|
" str data;"
|
||||||
|
" function fun() {\n"
|
||||||
|
" var a = data;\n"
|
||||||
|
" data = a;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE_END()
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
488
solidityNatspecJSON.cpp
Normal file
488
solidityNatspecJSON.cpp
Normal file
@ -0,0 +1,488 @@
|
|||||||
|
/*
|
||||||
|
This file is part of cpp-ethereum.
|
||||||
|
|
||||||
|
cpp-ethereum is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
cpp-ethereum is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* @author Lefteris Karapetsas <lefteris@ethdev.com>
|
||||||
|
* @date 2014
|
||||||
|
* Unit tests for the solidity compiler JSON Interface output.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <boost/test/unit_test.hpp>
|
||||||
|
#include <jsoncpp/json/json.h>
|
||||||
|
#include <libsolidity/CompilerStack.h>
|
||||||
|
#include <libsolidity/Exceptions.h>
|
||||||
|
#include <libdevcore/Exceptions.h>
|
||||||
|
|
||||||
|
namespace dev
|
||||||
|
{
|
||||||
|
namespace solidity
|
||||||
|
{
|
||||||
|
namespace test
|
||||||
|
{
|
||||||
|
|
||||||
|
class DocumentationChecker
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
void checkNatspec(std::string const& _code,
|
||||||
|
std::string const& _expectedDocumentationString,
|
||||||
|
bool _userDocumentation)
|
||||||
|
{
|
||||||
|
std::string generatedDocumentationString;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
m_compilerStack.parse(_code);
|
||||||
|
}
|
||||||
|
catch (const std::exception& e)
|
||||||
|
{
|
||||||
|
std::string const* extra = boost::get_error_info<errinfo_comment>(e);
|
||||||
|
std::string msg = std::string("Parsing contract failed with: ") +
|
||||||
|
e.what() + std::string("\n");
|
||||||
|
if (extra)
|
||||||
|
msg += *extra;
|
||||||
|
BOOST_FAIL(msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_userDocumentation)
|
||||||
|
generatedDocumentationString = m_compilerStack.getJsonDocumentation("", DocumentationType::NATSPEC_USER);
|
||||||
|
else
|
||||||
|
generatedDocumentationString = m_compilerStack.getJsonDocumentation("", DocumentationType::NATSPEC_DEV);
|
||||||
|
Json::Value generatedDocumentation;
|
||||||
|
m_reader.parse(generatedDocumentationString, generatedDocumentation);
|
||||||
|
Json::Value expectedDocumentation;
|
||||||
|
m_reader.parse(_expectedDocumentationString, expectedDocumentation);
|
||||||
|
BOOST_CHECK_MESSAGE(expectedDocumentation == generatedDocumentation,
|
||||||
|
"Expected " << _expectedDocumentationString <<
|
||||||
|
"\n but got:\n" << generatedDocumentationString);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
CompilerStack m_compilerStack;
|
||||||
|
Json::Reader m_reader;
|
||||||
|
};
|
||||||
|
|
||||||
|
BOOST_FIXTURE_TEST_SUITE(SolidityNatspecJSON, DocumentationChecker)
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(user_basic_test)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @notice Multiplies `a` by 7\n"
|
||||||
|
" function mul(uint a) returns(uint d) { return a * 7; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \"notice\": \"Multiplies `a` by 7\"}"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_and_user_basic_test)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @notice Multiplies `a` by 7\n"
|
||||||
|
" /// @dev Multiplies a number by 7\n"
|
||||||
|
" function mul(uint a) returns(uint d) { return a * 7; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* devNatspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Multiplies a number by 7\"\n"
|
||||||
|
" }\n"
|
||||||
|
" }\n"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
char const* userNatspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \"notice\": \"Multiplies `a` by 7\"}"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, devNatspec, false);
|
||||||
|
checkNatspec(sourceCode, userNatspec, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(user_multiline_comment)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @notice Multiplies `a` by 7\n"
|
||||||
|
" /// and then adds `b`\n"
|
||||||
|
" function mul_and_add(uint a, uint256 b) returns(uint256 d)\n"
|
||||||
|
" {\n"
|
||||||
|
" return (a * 7) + b;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul_and_add\":{ \"notice\": \"Multiplies `a` by 7 and then adds `b`\"}"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(user_multiple_functions)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @notice Multiplies `a` by 7 and then adds `b`\n"
|
||||||
|
" function mul_and_add(uint a, uint256 b) returns(uint256 d)\n"
|
||||||
|
" {\n"
|
||||||
|
" return (a * 7) + b;\n"
|
||||||
|
" }\n"
|
||||||
|
"\n"
|
||||||
|
" /// @notice Divides `input` by `div`\n"
|
||||||
|
" function divide(uint input, uint div) returns(uint d)\n"
|
||||||
|
" {\n"
|
||||||
|
" return input / div;\n"
|
||||||
|
" }\n"
|
||||||
|
" /// @notice Subtracts 3 from `input`\n"
|
||||||
|
" function sub(int input) returns(int d)\n"
|
||||||
|
" {\n"
|
||||||
|
" return input - 3;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul_and_add\":{ \"notice\": \"Multiplies `a` by 7 and then adds `b`\"},"
|
||||||
|
" \"divide\":{ \"notice\": \"Divides `input` by `div`\"},"
|
||||||
|
" \"sub\":{ \"notice\": \"Subtracts 3 from `input`\"}"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(user_empty_contract)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{\"methods\":{} }";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_and_user_no_doc)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" function mul(uint a) returns(uint d) { return a * 7; }\n"
|
||||||
|
" function sub(int input) returns(int d)\n"
|
||||||
|
" {\n"
|
||||||
|
" return input - 3;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* devNatspec = "{\"methods\":{}}";
|
||||||
|
|
||||||
|
char const* userNatspec = "{\"methods\":{}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, devNatspec, false);
|
||||||
|
checkNatspec(sourceCode, userNatspec, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_desc_after_nl)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @dev\n"
|
||||||
|
" /// Multiplies a number by 7 and adds second parameter\n"
|
||||||
|
" /// @param a Documentation for the first parameter\n"
|
||||||
|
" /// @param second Documentation for the second parameter\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \" Multiplies a number by 7 and adds second parameter\",\n"
|
||||||
|
" \"params\": {\n"
|
||||||
|
" \"a\": \"Documentation for the first parameter\",\n"
|
||||||
|
" \"second\": \"Documentation for the second parameter\"\n"
|
||||||
|
" }\n"
|
||||||
|
" }\n"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_multiple_params)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @dev Multiplies a number by 7 and adds second parameter\n"
|
||||||
|
" /// @param a Documentation for the first parameter\n"
|
||||||
|
" /// @param second Documentation for the second parameter\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
|
||||||
|
" \"params\": {\n"
|
||||||
|
" \"a\": \"Documentation for the first parameter\",\n"
|
||||||
|
" \"second\": \"Documentation for the second parameter\"\n"
|
||||||
|
" }\n"
|
||||||
|
" }\n"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_mutiline_param_description)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @dev Multiplies a number by 7 and adds second parameter\n"
|
||||||
|
" /// @param a Documentation for the first parameter starts here.\n"
|
||||||
|
" /// Since it's a really complicated parameter we need 2 lines\n"
|
||||||
|
" /// @param second Documentation for the second parameter\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
|
||||||
|
" \"params\": {\n"
|
||||||
|
" \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
|
||||||
|
" \"second\": \"Documentation for the second parameter\"\n"
|
||||||
|
" }\n"
|
||||||
|
" }\n"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_multiple_functions)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @dev Multiplies a number by 7 and adds second parameter\n"
|
||||||
|
" /// @param a Documentation for the first parameter\n"
|
||||||
|
" /// @param second Documentation for the second parameter\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
" \n"
|
||||||
|
" /// @dev Divides 2 numbers\n"
|
||||||
|
" /// @param input Documentation for the input parameter\n"
|
||||||
|
" /// @param div Documentation for the div parameter\n"
|
||||||
|
" function divide(uint input, uint div) returns(uint d)\n"
|
||||||
|
" {\n"
|
||||||
|
" return input / div;\n"
|
||||||
|
" }\n"
|
||||||
|
" /// @dev Subtracts 3 from `input`\n"
|
||||||
|
" /// @param input Documentation for the input parameter\n"
|
||||||
|
" function sub(int input) returns(int d)\n"
|
||||||
|
" {\n"
|
||||||
|
" return input - 3;\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
|
||||||
|
" \"params\": {\n"
|
||||||
|
" \"a\": \"Documentation for the first parameter\",\n"
|
||||||
|
" \"second\": \"Documentation for the second parameter\"\n"
|
||||||
|
" }\n"
|
||||||
|
" },\n"
|
||||||
|
" \"divide\":{ \n"
|
||||||
|
" \"details\": \"Divides 2 numbers\",\n"
|
||||||
|
" \"params\": {\n"
|
||||||
|
" \"input\": \"Documentation for the input parameter\",\n"
|
||||||
|
" \"div\": \"Documentation for the div parameter\"\n"
|
||||||
|
" }\n"
|
||||||
|
" },\n"
|
||||||
|
" \"sub\":{ \n"
|
||||||
|
" \"details\": \"Subtracts 3 from `input`\",\n"
|
||||||
|
" \"params\": {\n"
|
||||||
|
" \"input\": \"Documentation for the input parameter\"\n"
|
||||||
|
" }\n"
|
||||||
|
" }\n"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_return)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @dev Multiplies a number by 7 and adds second parameter\n"
|
||||||
|
" /// @param a Documentation for the first parameter starts here.\n"
|
||||||
|
" /// Since it's a really complicated parameter we need 2 lines\n"
|
||||||
|
" /// @param second Documentation for the second parameter\n"
|
||||||
|
" /// @return The result of the multiplication\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
|
||||||
|
" \"params\": {\n"
|
||||||
|
" \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
|
||||||
|
" \"second\": \"Documentation for the second parameter\"\n"
|
||||||
|
" },\n"
|
||||||
|
" \"return\": \"The result of the multiplication\"\n"
|
||||||
|
" }\n"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_return_desc_after_nl)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @dev Multiplies a number by 7 and adds second parameter\n"
|
||||||
|
" /// @param a Documentation for the first parameter starts here.\n"
|
||||||
|
" /// Since it's a really complicated parameter we need 2 lines\n"
|
||||||
|
" /// @param second Documentation for the second parameter\n"
|
||||||
|
" /// @return\n"
|
||||||
|
" /// The result of the multiplication\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
|
||||||
|
" \"params\": {\n"
|
||||||
|
" \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
|
||||||
|
" \"second\": \"Documentation for the second parameter\"\n"
|
||||||
|
" },\n"
|
||||||
|
" \"return\": \" The result of the multiplication\"\n"
|
||||||
|
" }\n"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_multiline_return)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @dev Multiplies a number by 7 and adds second parameter\n"
|
||||||
|
" /// @param a Documentation for the first parameter starts here.\n"
|
||||||
|
" /// Since it's a really complicated parameter we need 2 lines\n"
|
||||||
|
" /// @param second Documentation for the second parameter\n"
|
||||||
|
" /// @return The result of the multiplication\n"
|
||||||
|
" /// and cookies with nutella\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
"\"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
|
||||||
|
" \"params\": {\n"
|
||||||
|
" \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
|
||||||
|
" \"second\": \"Documentation for the second parameter\"\n"
|
||||||
|
" },\n"
|
||||||
|
" \"return\": \"The result of the multiplication and cookies with nutella\"\n"
|
||||||
|
" }\n"
|
||||||
|
"}}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_contract_no_doc)
|
||||||
|
{
|
||||||
|
char const* sourceCode = "contract test {\n"
|
||||||
|
" /// @dev Mul function\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
" \"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Mul function\"\n"
|
||||||
|
" }\n"
|
||||||
|
" }\n"
|
||||||
|
"}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_contract_doc)
|
||||||
|
{
|
||||||
|
char const* sourceCode = " /// @author Lefteris\n"
|
||||||
|
" /// @title Just a test contract\n"
|
||||||
|
"contract test {\n"
|
||||||
|
" /// @dev Mul function\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
" \"author\": \"Lefteris\","
|
||||||
|
" \"title\": \"Just a test contract\","
|
||||||
|
" \"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Mul function\"\n"
|
||||||
|
" }\n"
|
||||||
|
" }\n"
|
||||||
|
"}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_author_at_function)
|
||||||
|
{
|
||||||
|
char const* sourceCode = " /// @author Lefteris\n"
|
||||||
|
" /// @title Just a test contract\n"
|
||||||
|
"contract test {\n"
|
||||||
|
" /// @dev Mul function\n"
|
||||||
|
" /// @author John Doe\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
" \"author\": \"Lefteris\","
|
||||||
|
" \"title\": \"Just a test contract\","
|
||||||
|
" \"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Mul function\",\n"
|
||||||
|
" \"author\": \"John Doe\",\n"
|
||||||
|
" }\n"
|
||||||
|
" }\n"
|
||||||
|
"}";
|
||||||
|
|
||||||
|
checkNatspec(sourceCode, natspec, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(dev_title_at_function_error)
|
||||||
|
{
|
||||||
|
char const* sourceCode = " /// @author Lefteris\n"
|
||||||
|
" /// @title Just a test contract\n"
|
||||||
|
"contract test {\n"
|
||||||
|
" /// @dev Mul function\n"
|
||||||
|
" /// @title I really should not be here\n"
|
||||||
|
" function mul(uint a, uint second) returns(uint d) { return a * 7 + second; }\n"
|
||||||
|
"}\n";
|
||||||
|
|
||||||
|
char const* natspec = "{"
|
||||||
|
" \"author\": \"Lefteris\","
|
||||||
|
" \"title\": \"Just a test contract\","
|
||||||
|
" \"methods\":{"
|
||||||
|
" \"mul\":{ \n"
|
||||||
|
" \"details\": \"Mul function\"\n"
|
||||||
|
" }\n"
|
||||||
|
" }\n"
|
||||||
|
"}";
|
||||||
|
|
||||||
|
BOOST_CHECK_THROW(checkNatspec(sourceCode, natspec, false), DocstringParsingError);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
146
solidityOptimizerTest.cpp
Normal file
146
solidityOptimizerTest.cpp
Normal file
@ -0,0 +1,146 @@
|
|||||||
|
|
||||||
|
/*
|
||||||
|
This file is part of cpp-ethereum.
|
||||||
|
|
||||||
|
cpp-ethereum is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
cpp-ethereum is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* @author Christian <c@ethdev.com>
|
||||||
|
* @date 2014
|
||||||
|
* Tests for the Solidity optimizer.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <tuple>
|
||||||
|
#include <boost/test/unit_test.hpp>
|
||||||
|
#include <boost/lexical_cast.hpp>
|
||||||
|
#include <test/solidityExecutionFramework.h>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
|
namespace dev
|
||||||
|
{
|
||||||
|
namespace solidity
|
||||||
|
{
|
||||||
|
namespace test
|
||||||
|
{
|
||||||
|
|
||||||
|
class OptimizerTestFramework: public ExecutionFramework
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
OptimizerTestFramework() { }
|
||||||
|
/// Compiles the source code with and without optimizing.
|
||||||
|
void compileBothVersions(unsigned _expectedSizeDecrease, std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "") {
|
||||||
|
m_optimize = false;
|
||||||
|
bytes nonOptimizedBytecode = compileAndRun(_sourceCode, _value, _contractName);
|
||||||
|
m_nonOptimizedContract = m_contractAddress;
|
||||||
|
m_optimize = true;
|
||||||
|
bytes optimizedBytecode = compileAndRun(_sourceCode, _value, _contractName);
|
||||||
|
int sizeDiff = nonOptimizedBytecode.size() - optimizedBytecode.size();
|
||||||
|
BOOST_CHECK_MESSAGE(sizeDiff == int(_expectedSizeDecrease), "Bytecode did only shrink by "
|
||||||
|
+ boost::lexical_cast<string>(sizeDiff) + " bytes, expected: "
|
||||||
|
+ boost::lexical_cast<string>(_expectedSizeDecrease));
|
||||||
|
m_optimizedContract = m_contractAddress;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <class... Args>
|
||||||
|
void compareVersions(byte _index, Args const&... _arguments)
|
||||||
|
{
|
||||||
|
m_contractAddress = m_nonOptimizedContract;
|
||||||
|
bytes nonOptimizedOutput = callContractFunction(_index, _arguments...);
|
||||||
|
m_contractAddress = m_optimizedContract;
|
||||||
|
bytes optimizedOutput = callContractFunction(_index, _arguments...);
|
||||||
|
BOOST_CHECK_MESSAGE(nonOptimizedOutput == optimizedOutput, "Computed values do not match."
|
||||||
|
"\nNon-Optimized: " + toHex(nonOptimizedOutput) +
|
||||||
|
"\nOptimized: " + toHex(optimizedOutput));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
Address m_optimizedContract;
|
||||||
|
Address m_nonOptimizedContract;
|
||||||
|
};
|
||||||
|
|
||||||
|
BOOST_FIXTURE_TEST_SUITE(SolidityOptimizerTest, OptimizerTestFramework)
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(smoke_test)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract test {
|
||||||
|
function f(uint a) returns (uint b) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileBothVersions(4, sourceCode);
|
||||||
|
compareVersions(0, u256(7));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(large_integers)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract test {
|
||||||
|
function f() returns (uint a, uint b) {
|
||||||
|
a = 0x234234872642837426347000000;
|
||||||
|
b = 0x110000000000000000000000002;
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileBothVersions(28, sourceCode);
|
||||||
|
compareVersions(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(invariants)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract test {
|
||||||
|
function f(uint a) returns (uint b) {
|
||||||
|
return (((a + (1 - 1)) ^ 0) | 0) & (uint(0) - 1);
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileBothVersions(28, sourceCode);
|
||||||
|
compareVersions(0, u256(0x12334664));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(unused_expressions)
|
||||||
|
{
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract test {
|
||||||
|
uint data;
|
||||||
|
function f() returns (uint a, uint b) {
|
||||||
|
10 + 20;
|
||||||
|
data;
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileBothVersions(11, sourceCode);
|
||||||
|
compareVersions(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(constant_folding_both_sides)
|
||||||
|
{
|
||||||
|
// if constants involving the same associative and commutative operator are applied from both
|
||||||
|
// sides, the operator should be applied only once, because the expression compiler
|
||||||
|
// (even in non-optimized mode) pushes literals as late as possible
|
||||||
|
char const* sourceCode = R"(
|
||||||
|
contract test {
|
||||||
|
function f(uint x) returns (uint y) {
|
||||||
|
return 98 ^ (7 * ((1 | (x | 1000)) * 40) ^ 102);
|
||||||
|
}
|
||||||
|
})";
|
||||||
|
compileBothVersions(31, sourceCode);
|
||||||
|
compareVersions(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} // end namespaces
|
@ -21,13 +21,15 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include <libdevcore/Log.h>
|
#include <libdevcore/Log.h>
|
||||||
#include <libsolidity/Scanner.h>
|
#include <libsolidity/Scanner.h>
|
||||||
#include <libsolidity/Parser.h>
|
#include <libsolidity/Parser.h>
|
||||||
#include <libsolidity/Exceptions.h>
|
#include <libsolidity/Exceptions.h>
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
namespace dev
|
namespace dev
|
||||||
{
|
{
|
||||||
namespace solidity
|
namespace solidity
|
||||||
@ -37,13 +39,19 @@ namespace test
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
ASTPointer<ASTNode> parseText(std::string const& _source)
|
ASTPointer<ContractDefinition> parseText(std::string const& _source)
|
||||||
{
|
{
|
||||||
Parser parser;
|
Parser parser;
|
||||||
return parser.parse(std::make_shared<Scanner>(CharStream(_source)));
|
ASTPointer<SourceUnit> sourceUnit = parser.parse(std::make_shared<Scanner>(CharStream(_source)));
|
||||||
|
for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
|
||||||
|
if (ASTPointer<ContractDefinition> contract = dynamic_pointer_cast<ContractDefinition>(node))
|
||||||
|
return contract;
|
||||||
|
BOOST_FAIL("No contract found in source.");
|
||||||
|
return ASTPointer<ContractDefinition>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE(SolidityParser)
|
BOOST_AUTO_TEST_SUITE(SolidityParser)
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(smoke_test)
|
BOOST_AUTO_TEST_CASE(smoke_test)
|
||||||
@ -91,6 +99,164 @@ BOOST_AUTO_TEST_CASE(single_function_param)
|
|||||||
BOOST_CHECK_NO_THROW(parseText(text));
|
BOOST_CHECK_NO_THROW(parseText(text));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(function_natspec_documentation)
|
||||||
|
{
|
||||||
|
ASTPointer<ContractDefinition> contract;
|
||||||
|
ASTPointer<FunctionDefinition> function;
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" uint256 stateVar;\n"
|
||||||
|
" /// This is a test function\n"
|
||||||
|
" function functionName(hash hashin) returns (hash hashout) {}\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_REQUIRE_NO_THROW(contract = parseText(text));
|
||||||
|
auto functions = contract->getDefinedFunctions();
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(0));
|
||||||
|
BOOST_CHECK_EQUAL(*function->getDocumentation(), " This is a test function");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(function_normal_comments)
|
||||||
|
{
|
||||||
|
ASTPointer<ContractDefinition> contract;
|
||||||
|
ASTPointer<FunctionDefinition> function;
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" uint256 stateVar;\n"
|
||||||
|
" // We won't see this comment\n"
|
||||||
|
" function functionName(hash hashin) returns (hash hashout) {}\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_REQUIRE_NO_THROW(contract = parseText(text));
|
||||||
|
auto functions = contract->getDefinedFunctions();
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(0));
|
||||||
|
BOOST_CHECK_MESSAGE(function->getDocumentation() == nullptr,
|
||||||
|
"Should not have gotten a Natspect comment for this function");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(multiple_functions_natspec_documentation)
|
||||||
|
{
|
||||||
|
ASTPointer<ContractDefinition> contract;
|
||||||
|
ASTPointer<FunctionDefinition> function;
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" uint256 stateVar;\n"
|
||||||
|
" /// This is test function 1\n"
|
||||||
|
" function functionName1(hash hashin) returns (hash hashout) {}\n"
|
||||||
|
" /// This is test function 2\n"
|
||||||
|
" function functionName2(hash hashin) returns (hash hashout) {}\n"
|
||||||
|
" // nothing to see here\n"
|
||||||
|
" function functionName3(hash hashin) returns (hash hashout) {}\n"
|
||||||
|
" /// This is test function 4\n"
|
||||||
|
" function functionName4(hash hashin) returns (hash hashout) {}\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_REQUIRE_NO_THROW(contract = parseText(text));
|
||||||
|
auto functions = contract->getDefinedFunctions();
|
||||||
|
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(0));
|
||||||
|
BOOST_CHECK_EQUAL(*function->getDocumentation(), " This is test function 1");
|
||||||
|
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(1));
|
||||||
|
BOOST_CHECK_EQUAL(*function->getDocumentation(), " This is test function 2");
|
||||||
|
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(2));
|
||||||
|
BOOST_CHECK_MESSAGE(function->getDocumentation() == nullptr,
|
||||||
|
"Should not have gotten natspec comment for functionName3()");
|
||||||
|
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(3));
|
||||||
|
BOOST_CHECK_EQUAL(*function->getDocumentation(), " This is test function 4");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(multiline_function_documentation)
|
||||||
|
{
|
||||||
|
ASTPointer<ContractDefinition> contract;
|
||||||
|
ASTPointer<FunctionDefinition> function;
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" uint256 stateVar;\n"
|
||||||
|
" /// This is a test function\n"
|
||||||
|
" /// and it has 2 lines\n"
|
||||||
|
" function functionName1(hash hashin) returns (hash hashout) {}\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_REQUIRE_NO_THROW(contract = parseText(text));
|
||||||
|
auto functions = contract->getDefinedFunctions();
|
||||||
|
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(0));
|
||||||
|
BOOST_CHECK_EQUAL(*function->getDocumentation(),
|
||||||
|
" This is a test function\n"
|
||||||
|
" and it has 2 lines");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(natspec_comment_in_function_body)
|
||||||
|
{
|
||||||
|
ASTPointer<ContractDefinition> contract;
|
||||||
|
ASTPointer<FunctionDefinition> function;
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" /// fun1 description\n"
|
||||||
|
" function fun1(uint256 a) {\n"
|
||||||
|
" var b;\n"
|
||||||
|
" /// I should not interfere with actual natspec comments\n"
|
||||||
|
" uint256 c;\n"
|
||||||
|
" mapping(address=>hash) d;\n"
|
||||||
|
" string name = \"Solidity\";"
|
||||||
|
" }\n"
|
||||||
|
" uint256 stateVar;\n"
|
||||||
|
" /// This is a test function\n"
|
||||||
|
" /// and it has 2 lines\n"
|
||||||
|
" function fun(hash hashin) returns (hash hashout) {}\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_REQUIRE_NO_THROW(contract = parseText(text));
|
||||||
|
auto functions = contract->getDefinedFunctions();
|
||||||
|
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(0));
|
||||||
|
BOOST_CHECK_EQUAL(*function->getDocumentation(), " fun1 description");
|
||||||
|
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(1));
|
||||||
|
BOOST_CHECK_EQUAL(*function->getDocumentation(),
|
||||||
|
" This is a test function\n"
|
||||||
|
" and it has 2 lines");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(natspec_docstring_between_keyword_and_signature)
|
||||||
|
{
|
||||||
|
ASTPointer<ContractDefinition> contract;
|
||||||
|
ASTPointer<FunctionDefinition> function;
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" uint256 stateVar;\n"
|
||||||
|
" function ///I am in the wrong place \n"
|
||||||
|
" fun1(uint256 a) {\n"
|
||||||
|
" var b;\n"
|
||||||
|
" /// I should not interfere with actual natspec comments\n"
|
||||||
|
" uint256 c;\n"
|
||||||
|
" mapping(address=>hash) d;\n"
|
||||||
|
" string name = \"Solidity\";"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_REQUIRE_NO_THROW(contract = parseText(text));
|
||||||
|
auto functions = contract->getDefinedFunctions();
|
||||||
|
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(0));
|
||||||
|
BOOST_CHECK_MESSAGE(!function->getDocumentation(),
|
||||||
|
"Shouldn't get natspec docstring for this function");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(natspec_docstring_after_signature)
|
||||||
|
{
|
||||||
|
ASTPointer<ContractDefinition> contract;
|
||||||
|
ASTPointer<FunctionDefinition> function;
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" uint256 stateVar;\n"
|
||||||
|
" function fun1(uint256 a) {\n"
|
||||||
|
" /// I should have been above the function signature\n"
|
||||||
|
" var b;\n"
|
||||||
|
" /// I should not interfere with actual natspec comments\n"
|
||||||
|
" uint256 c;\n"
|
||||||
|
" mapping(address=>hash) d;\n"
|
||||||
|
" string name = \"Solidity\";"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_REQUIRE_NO_THROW(contract = parseText(text));
|
||||||
|
auto functions = contract->getDefinedFunctions();
|
||||||
|
|
||||||
|
BOOST_REQUIRE_NO_THROW(function = functions.at(0));
|
||||||
|
BOOST_CHECK_MESSAGE(!function->getDocumentation(),
|
||||||
|
"Shouldn't get natspec docstring for this function");
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(struct_definition)
|
BOOST_AUTO_TEST_CASE(struct_definition)
|
||||||
{
|
{
|
||||||
char const* text = "contract test {\n"
|
char const* text = "contract test {\n"
|
||||||
@ -221,6 +387,50 @@ BOOST_AUTO_TEST_CASE(statement_starting_with_type_conversion)
|
|||||||
BOOST_CHECK_NO_THROW(parseText(text));
|
BOOST_CHECK_NO_THROW(parseText(text));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(import_directive)
|
||||||
|
{
|
||||||
|
char const* text = "import \"abc\";\n"
|
||||||
|
"contract test {\n"
|
||||||
|
" function fun() {\n"
|
||||||
|
" uint64(2);\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_NO_THROW(parseText(text));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(multiple_contracts)
|
||||||
|
{
|
||||||
|
char const* text = "contract test {\n"
|
||||||
|
" function fun() {\n"
|
||||||
|
" uint64(2);\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n"
|
||||||
|
"contract test2 {\n"
|
||||||
|
" function fun() {\n"
|
||||||
|
" uint64(2);\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n";
|
||||||
|
BOOST_CHECK_NO_THROW(parseText(text));
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(multiple_contracts_and_imports)
|
||||||
|
{
|
||||||
|
char const* text = "import \"abc\";\n"
|
||||||
|
"contract test {\n"
|
||||||
|
" function fun() {\n"
|
||||||
|
" uint64(2);\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n"
|
||||||
|
"import \"def\";\n"
|
||||||
|
"contract test2 {\n"
|
||||||
|
" function fun() {\n"
|
||||||
|
" uint64(2);\n"
|
||||||
|
" }\n"
|
||||||
|
"}\n"
|
||||||
|
"import \"ghi\";\n";
|
||||||
|
BOOST_CHECK_NO_THROW(parseText(text));
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE_END()
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -153,6 +153,46 @@ BOOST_AUTO_TEST_CASE(ambiguities)
|
|||||||
BOOST_CHECK_EQUAL(scanner.next(), Token::SHL);
|
BOOST_CHECK_EQUAL(scanner.next(), Token::SHL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(documentation_comments_parsed_begin)
|
||||||
|
{
|
||||||
|
Scanner scanner(CharStream("/// Send $(value / 1000) chocolates to the user"));
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::EOS);
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentCommentLiteral(), " Send $(value / 1000) chocolates to the user");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(documentation_comments_parsed)
|
||||||
|
{
|
||||||
|
Scanner scanner(CharStream("some other tokens /// Send $(value / 1000) chocolates to the user"));
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::IDENTIFIER);
|
||||||
|
BOOST_CHECK_EQUAL(scanner.next(), Token::IDENTIFIER);
|
||||||
|
BOOST_CHECK_EQUAL(scanner.next(), Token::IDENTIFIER);
|
||||||
|
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentCommentLiteral(), " Send $(value / 1000) chocolates to the user");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(comment_before_eos)
|
||||||
|
{
|
||||||
|
Scanner scanner(CharStream("//"));
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::EOS);
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentCommentLiteral(), "");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(documentation_comment_before_eos)
|
||||||
|
{
|
||||||
|
Scanner scanner(CharStream("///"));
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::EOS);
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentCommentLiteral(), "");
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(comments_mixed_in_sequence)
|
||||||
|
{
|
||||||
|
Scanner scanner(CharStream("hello_world ///documentation comment \n"
|
||||||
|
"//simple comment \n"
|
||||||
|
"<<"));
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::IDENTIFIER);
|
||||||
|
BOOST_CHECK_EQUAL(scanner.next(), Token::SHL);
|
||||||
|
BOOST_CHECK_EQUAL(scanner.getCurrentCommentLiteral(), "documentation comment ");
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE_END()
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
|
||||||
|
37
stExampleFiller.json
Normal file
37
stExampleFiller.json
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
{
|
||||||
|
"add11" : {
|
||||||
|
"env" : {
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentGasLimit" : "1000000",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"code" : "0x6001600101600055",
|
||||||
|
"nonce" : "0",
|
||||||
|
"storage" : {
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"code" : "0x",
|
||||||
|
"nonce" : "0",
|
||||||
|
"storage" : {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"transaction" : {
|
||||||
|
"data" : "",
|
||||||
|
"gasLimit" : "10000",
|
||||||
|
"gasPrice" : "1",
|
||||||
|
"nonce" : "0",
|
||||||
|
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
|
||||||
|
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
|
||||||
|
"value" : "100000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
1851
stLogTestsFiller.json
Normal file
1851
stLogTestsFiller.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -33,6 +33,75 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"CallEcrecover0_overlappingInputOutput": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "10000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
|
"balance" : "20000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 1000 1 0 0 128 64 32) [[ 0 ]] (MOD (MLOAD 64) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"transaction" : {
|
||||||
|
"nonce" : "0",
|
||||||
|
"gasPrice" : "1",
|
||||||
|
"gasLimit" : "365224",
|
||||||
|
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
|
||||||
|
"value" : "100000",
|
||||||
|
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
|
||||||
|
"data" : ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
"CallEcrecover0_completeReturnValue": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "10000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
|
"balance" : "20000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code": "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 1000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) }",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"transaction" : {
|
||||||
|
"nonce" : "0",
|
||||||
|
"gasPrice" : "1",
|
||||||
|
"gasLimit" : "365224",
|
||||||
|
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
|
||||||
|
"value" : "100000",
|
||||||
|
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
|
||||||
|
"data" : ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
"CallEcrecover0_gas500": {
|
"CallEcrecover0_gas500": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
@ -305,6 +374,40 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"CallSha256_1_nonzeroValue": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "10000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
|
"balance" : "20000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ [[ 2 ]] (CALL 500 2 0x13 0 0 0 32) [[ 0 ]] (MLOAD 0)}",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"transaction" : {
|
||||||
|
"nonce" : "0",
|
||||||
|
"gasPrice" : "1",
|
||||||
|
"gasLimit" : "365224",
|
||||||
|
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
|
||||||
|
"value" : "100000",
|
||||||
|
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
|
||||||
|
"data" : ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
"CallSha256_2": {
|
"CallSha256_2": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
35
stRecursiveCreateFiller.json
Normal file
35
stRecursiveCreateFiller.json
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"recursiveCreate": {
|
||||||
|
"env": {
|
||||||
|
"previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber": "0",
|
||||||
|
"currentGasLimit": "10000000",
|
||||||
|
"currentDifficulty": "256",
|
||||||
|
"currentTimestamp": 1,
|
||||||
|
"currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre": {
|
||||||
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87": {
|
||||||
|
"balance": "20000000",
|
||||||
|
"nonce": 0,
|
||||||
|
"code": "{(CODECOPY 0 0 32)(CREATE 0 0 32)}",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
|
||||||
|
"balance": "1000000000000000000",
|
||||||
|
"nonce": 0,
|
||||||
|
"code": "",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"transaction": {
|
||||||
|
"nonce": "0",
|
||||||
|
"gasPrice": "1",
|
||||||
|
"gasLimit": "465224",
|
||||||
|
"to": "095e7baea6a6c7c4c2dfeb977efac326af552d87",
|
||||||
|
"value": "100000",
|
||||||
|
"secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
|
||||||
|
"data": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
41
stSpecialTestFiller.json
Normal file
41
stSpecialTestFiller.json
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
{
|
||||||
|
"makeMoney" : {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "1000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ (MSTORE 0 0x601080600c6000396000f20060003554156009570060203560003555) (CALL 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffec 0xaaaaaaaaace5edbc8e2a8697c15331677e6ebf0b 23 0 0 0 0) }",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "0x600160015532600255",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
|
"balance" : "1000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"transaction" : {
|
||||||
|
"nonce" : "0",
|
||||||
|
"gasPrice" : "1",
|
||||||
|
"gasLimit" : "850",
|
||||||
|
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
|
||||||
|
"value" : "10",
|
||||||
|
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
|
||||||
|
"data" : ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -12,7 +12,7 @@
|
|||||||
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
"balance" : "1000000000000000000",
|
"balance" : "1000000000000000000",
|
||||||
"nonce" : 0,
|
"nonce" : 0,
|
||||||
"code" : "{ (MSTORE 0 0x601080600c6000396000f20060003554156009570060203560003555) [[ 0 ]] (CREATE 23 4 28) }",
|
"code" : "{ (MSTORE 0 0x601080600c6000396000f30060003554156009570060203560003555) [[ 0 ]] (CREATE 23 4 28) }",
|
||||||
"storage": {}
|
"storage": {}
|
||||||
},
|
},
|
||||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
@ -46,7 +46,7 @@
|
|||||||
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
"balance" : "1000000000000000000",
|
"balance" : "1000000000000000000",
|
||||||
"nonce" : 0,
|
"nonce" : 0,
|
||||||
"code" : "{ (MSTORE 0 0x601080600c6000396000f20060003554156009570060203560003555) [[ 0 ]] (CREATE 1000 4 28) }",
|
"code" : "{ (MSTORE 0 0x601080600c6000396000f30060003554156009570060203560003555) [[ 0 ]] (CREATE 1000 4 28) }",
|
||||||
"storage": {}
|
"storage": {}
|
||||||
},
|
},
|
||||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
@ -80,7 +80,7 @@
|
|||||||
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
"balance" : "1000000000000000000",
|
"balance" : "1000000000000000000",
|
||||||
"nonce" : 0,
|
"nonce" : 0,
|
||||||
"code" : "{ (MSTORE 0 0x601080600c6000396000f20060003554156009570060203560003555) [[ 0 ]] (CREATE 23 0xfffffffffff 28) }",
|
"code" : "{ (MSTORE 0 0x601080600c6000396000f30060003554156009570060203560003555) [[ 0 ]] (CREATE 23 0xfffffffffff 28) }",
|
||||||
"storage": {}
|
"storage": {}
|
||||||
},
|
},
|
||||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
@ -114,7 +114,7 @@
|
|||||||
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
"balance" : "1000000000000000000",
|
"balance" : "1000000000000000000",
|
||||||
"nonce" : 0,
|
"nonce" : 0,
|
||||||
"code" : "{ (MSTORE 0 0x601080600c6000396000f20060003554156009570060203560003555) [[ 0 ]] (CREATE 23 4 0xfffffffffff) }",
|
"code" : "{ (MSTORE 0 0x601080600c6000396000f30060003554156009570060203560003555) [[ 0 ]] (CREATE 23 4 0xfffffffffff) }",
|
||||||
"storage": {}
|
"storage": {}
|
||||||
},
|
},
|
||||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
@ -195,7 +195,7 @@
|
|||||||
},
|
},
|
||||||
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
|
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
|
||||||
"balance" : "23",
|
"balance" : "23",
|
||||||
"code" : "0x6001600155603760005360026000f2",
|
"code" : "0x6001600155603760005360026000f3",
|
||||||
"nonce" : "0",
|
"nonce" : "0",
|
||||||
"storage" : {
|
"storage" : {
|
||||||
}
|
}
|
||||||
@ -321,7 +321,7 @@
|
|||||||
},
|
},
|
||||||
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
|
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
|
||||||
"balance" : "23",
|
"balance" : "23",
|
||||||
"code" : "0x6001600155603760005360026000f2",
|
"code" : "0x6001600155603760005360026000f3",
|
||||||
"nonce" : "0",
|
"nonce" : "0",
|
||||||
"storage" : {
|
"storage" : {
|
||||||
}
|
}
|
||||||
@ -634,6 +634,86 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"CallRecursiveBombLog": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "10000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
|
"balance" : "20000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0) }",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224) (ADDRESS) 0 0 0 0 0) } ",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"transaction" : {
|
||||||
|
"nonce" : "0",
|
||||||
|
"gasPrice" : "1",
|
||||||
|
"gasLimit" : "1000000",
|
||||||
|
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
|
||||||
|
"value" : "100000",
|
||||||
|
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
|
||||||
|
"data" : ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
"CallRecursiveBombLog2": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "10000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
|
||||||
|
"balance" : "20000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0) }",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ (MSTORE 0 (GAS)) (LOG0 0 32) [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224) (ADDRESS) 0 0 0 0 0) } ",
|
||||||
|
"storage": {}
|
||||||
|
},
|
||||||
|
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"transaction" : {
|
||||||
|
"nonce" : "0",
|
||||||
|
"gasPrice" : "1",
|
||||||
|
"gasLimit" : "1000000",
|
||||||
|
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
|
||||||
|
"value" : "100000",
|
||||||
|
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
|
||||||
|
"data" : ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
"CallRecursiveBomb1": {
|
"CallRecursiveBomb1": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
10
trie.cpp
10
trie.cpp
@ -54,13 +54,12 @@ BOOST_AUTO_TEST_CASE(trie_tests)
|
|||||||
{
|
{
|
||||||
string testPath = test::getTestPath();
|
string testPath = test::getTestPath();
|
||||||
|
|
||||||
|
|
||||||
testPath += "/TrieTests";
|
testPath += "/TrieTests";
|
||||||
|
|
||||||
cnote << "Testing Trie...";
|
cnote << "Testing Trie...";
|
||||||
js::mValue v;
|
js::mValue v;
|
||||||
string s = asString(contents(testPath + "/trietest.json"));
|
string s = asString(contents(testPath + "/trieanyorder.json"));
|
||||||
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trietest.json' is empty. Have you cloned the 'tests' repo branch develop?");
|
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trieanyorder.json' is empty. Have you cloned the 'tests' repo branch develop?");
|
||||||
js::read_string(s, v);
|
js::read_string(s, v);
|
||||||
for (auto& i: v.get_obj())
|
for (auto& i: v.get_obj())
|
||||||
{
|
{
|
||||||
@ -88,12 +87,11 @@ BOOST_AUTO_TEST_CASE(trie_tests)
|
|||||||
BOOST_REQUIRE(t.check(true));
|
BOOST_REQUIRE(t.check(true));
|
||||||
}
|
}
|
||||||
BOOST_REQUIRE(!o["root"].is_null());
|
BOOST_REQUIRE(!o["root"].is_null());
|
||||||
BOOST_CHECK_EQUAL(o["root"].get_str(), toHex(t.root().asArray()));
|
BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline h256 stringMapHash256(StringMap const& _s)
|
inline h256 stringMapHash256(StringMap const& _s)
|
||||||
{
|
{
|
||||||
return hash256(_s);
|
return hash256(_s);
|
||||||
@ -246,6 +244,7 @@ BOOST_AUTO_TEST_CASE(moreTrieTests)
|
|||||||
BOOST_AUTO_TEST_CASE(trieLowerBound)
|
BOOST_AUTO_TEST_CASE(trieLowerBound)
|
||||||
{
|
{
|
||||||
cnote << "Stress-testing Trie.lower_bound...";
|
cnote << "Stress-testing Trie.lower_bound...";
|
||||||
|
if (0)
|
||||||
{
|
{
|
||||||
MemoryDB dm;
|
MemoryDB dm;
|
||||||
EnforceRefs e(dm, true);
|
EnforceRefs e(dm, true);
|
||||||
@ -291,6 +290,7 @@ BOOST_AUTO_TEST_CASE(trieLowerBound)
|
|||||||
BOOST_AUTO_TEST_CASE(trieStess)
|
BOOST_AUTO_TEST_CASE(trieStess)
|
||||||
{
|
{
|
||||||
cnote << "Stress-testing Trie...";
|
cnote << "Stress-testing Trie...";
|
||||||
|
if (0)
|
||||||
{
|
{
|
||||||
MemoryDB m;
|
MemoryDB m;
|
||||||
MemoryDB dm;
|
MemoryDB dm;
|
||||||
|
136
vm.cpp
136
vm.cpp
@ -21,6 +21,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
|
#include <libethereum/Executive.h>
|
||||||
|
#include <libevm/VMFactory.h>
|
||||||
#include "vm.h"
|
#include "vm.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
@ -32,18 +34,18 @@ using namespace dev::test;
|
|||||||
FakeExtVM::FakeExtVM(eth::BlockInfo const& _previousBlock, eth::BlockInfo const& _currentBlock, unsigned _depth): /// TODO: XXX: remove the default argument & fix.
|
FakeExtVM::FakeExtVM(eth::BlockInfo const& _previousBlock, eth::BlockInfo const& _currentBlock, unsigned _depth): /// TODO: XXX: remove the default argument & fix.
|
||||||
ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytes(), _previousBlock, _currentBlock, _depth) {}
|
ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytes(), _previousBlock, _currentBlock, _depth) {}
|
||||||
|
|
||||||
h160 FakeExtVM::create(u256 _endowment, u256* _gas, bytesConstRef _init, OnOpFunc const&)
|
h160 FakeExtVM::create(u256 _endowment, u256& io_gas, bytesConstRef _init, OnOpFunc const&)
|
||||||
{
|
{
|
||||||
Address na = right160(sha3(rlpList(myAddress, get<1>(addresses[myAddress]))));
|
Address na = right160(sha3(rlpList(myAddress, get<1>(addresses[myAddress]))));
|
||||||
|
|
||||||
Transaction t(_endowment, gasPrice, *_gas, _init.toBytes());
|
Transaction t(_endowment, gasPrice, io_gas, _init.toBytes());
|
||||||
callcreates.push_back(t);
|
callcreates.push_back(t);
|
||||||
return na;
|
return na;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FakeExtVM::call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, OnOpFunc const&, Address _myAddressOverride, Address _codeAddressOverride)
|
bool FakeExtVM::call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256& io_gas, bytesRef _out, OnOpFunc const&, Address _myAddressOverride, Address _codeAddressOverride)
|
||||||
{
|
{
|
||||||
Transaction t(_value, gasPrice, *_gas, _receiveAddress, _data.toVector());
|
Transaction t(_value, gasPrice, io_gas, _receiveAddress, _data.toVector());
|
||||||
callcreates.push_back(t);
|
callcreates.push_back(t);
|
||||||
(void)_out;
|
(void)_out;
|
||||||
(void)_myAddressOverride;
|
(void)_myAddressOverride;
|
||||||
@ -241,10 +243,11 @@ void FakeExtVM::importCallCreates(mArray& _callcreates)
|
|||||||
|
|
||||||
eth::OnOpFunc FakeExtVM::simpleTrace()
|
eth::OnOpFunc FakeExtVM::simpleTrace()
|
||||||
{
|
{
|
||||||
return [](uint64_t steps, eth::Instruction inst, bigint newMemSize, bigint gasCost, void* voidVM, void const* voidExt)
|
|
||||||
|
return [](uint64_t steps, eth::Instruction inst, bigint newMemSize, bigint gasCost, dev::eth::VM* voidVM, dev::eth::ExtVMFace const* voidExt)
|
||||||
{
|
{
|
||||||
FakeExtVM const& ext = *(FakeExtVM const*)voidExt;
|
FakeExtVM const& ext = *static_cast<FakeExtVM const*>(voidExt);
|
||||||
eth::VM& vm = *(eth::VM*)voidVM;
|
eth::VM& vm = *voidVM;
|
||||||
|
|
||||||
std::ostringstream o;
|
std::ostringstream o;
|
||||||
o << std::endl << " STACK" << std::endl;
|
o << std::endl << " STACK" << std::endl;
|
||||||
@ -297,18 +300,19 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
|
|||||||
}
|
}
|
||||||
|
|
||||||
bytes output;
|
bytes output;
|
||||||
VM vm(fev.gas);
|
auto vm = eth::VMFactory::create(fev.gas);
|
||||||
|
|
||||||
u256 gas;
|
u256 gas;
|
||||||
|
bool vmExceptionOccured = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
output = vm.go(fev, fev.simpleTrace()).toVector();
|
output = vm->go(fev, fev.simpleTrace()).toBytes();
|
||||||
gas = vm.gas();
|
gas = vm->gas();
|
||||||
}
|
}
|
||||||
catch (VMException const& _e)
|
catch (VMException const& _e)
|
||||||
{
|
{
|
||||||
cnote << "VM did throw an exception: " << diagnostic_information(_e);
|
cnote << "Safe VM Exception";
|
||||||
gas = 0;
|
vmExceptionOccured = true;
|
||||||
}
|
}
|
||||||
catch (Exception const& _e)
|
catch (Exception const& _e)
|
||||||
{
|
{
|
||||||
@ -342,48 +346,63 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
|
|||||||
{
|
{
|
||||||
o["env"] = mValue(fev.exportEnv());
|
o["env"] = mValue(fev.exportEnv());
|
||||||
o["exec"] = mValue(fev.exportExec());
|
o["exec"] = mValue(fev.exportExec());
|
||||||
o["post"] = mValue(fev.exportState());
|
if (!vmExceptionOccured)
|
||||||
o["callcreates"] = fev.exportCallCreates();
|
{
|
||||||
o["out"] = "0x" + toHex(output);
|
o["post"] = mValue(fev.exportState());
|
||||||
fev.push(o, "gas", gas);
|
o["callcreates"] = fev.exportCallCreates();
|
||||||
|
o["out"] = "0x" + toHex(output);
|
||||||
|
fev.push(o, "gas", gas);
|
||||||
|
o["logs"] = exportLog(fev.sub.logs);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
BOOST_REQUIRE(o.count("post") > 0);
|
if (o.count("post") > 0) // No exceptions expected
|
||||||
BOOST_REQUIRE(o.count("callcreates") > 0);
|
|
||||||
BOOST_REQUIRE(o.count("out") > 0);
|
|
||||||
BOOST_REQUIRE(o.count("gas") > 0);
|
|
||||||
|
|
||||||
dev::test::FakeExtVM test;
|
|
||||||
test.importState(o["post"].get_obj());
|
|
||||||
test.importCallCreates(o["callcreates"].get_array());
|
|
||||||
|
|
||||||
checkOutput(output, o);
|
|
||||||
|
|
||||||
BOOST_CHECK_EQUAL(toInt(o["gas"]), gas);
|
|
||||||
|
|
||||||
auto& expectedAddrs = test.addresses;
|
|
||||||
auto& resultAddrs = fev.addresses;
|
|
||||||
for (auto&& expectedPair : expectedAddrs)
|
|
||||||
{
|
{
|
||||||
auto& expectedAddr = expectedPair.first;
|
BOOST_CHECK(!vmExceptionOccured);
|
||||||
auto resultAddrIt = resultAddrs.find(expectedAddr);
|
|
||||||
if (resultAddrIt == resultAddrs.end())
|
BOOST_REQUIRE(o.count("post") > 0);
|
||||||
BOOST_ERROR("Missing expected address " << expectedAddr);
|
BOOST_REQUIRE(o.count("callcreates") > 0);
|
||||||
else
|
BOOST_REQUIRE(o.count("out") > 0);
|
||||||
|
BOOST_REQUIRE(o.count("gas") > 0);
|
||||||
|
BOOST_REQUIRE(o.count("logs") > 0);
|
||||||
|
|
||||||
|
dev::test::FakeExtVM test;
|
||||||
|
test.importState(o["post"].get_obj());
|
||||||
|
test.importCallCreates(o["callcreates"].get_array());
|
||||||
|
test.sub.logs = importLog(o["logs"].get_array());
|
||||||
|
|
||||||
|
checkOutput(output, o);
|
||||||
|
|
||||||
|
BOOST_CHECK_EQUAL(toInt(o["gas"]), gas);
|
||||||
|
|
||||||
|
auto& expectedAddrs = test.addresses;
|
||||||
|
auto& resultAddrs = fev.addresses;
|
||||||
|
for (auto&& expectedPair : expectedAddrs)
|
||||||
{
|
{
|
||||||
auto& expectedState = expectedPair.second;
|
auto& expectedAddr = expectedPair.first;
|
||||||
auto& resultState = resultAddrIt->second;
|
auto resultAddrIt = resultAddrs.find(expectedAddr);
|
||||||
BOOST_CHECK_MESSAGE(std::get<0>(expectedState) == std::get<0>(resultState), expectedAddr << ": incorrect balance " << std::get<0>(resultState) << ", expected " << std::get<0>(expectedState));
|
if (resultAddrIt == resultAddrs.end())
|
||||||
BOOST_CHECK_MESSAGE(std::get<1>(expectedState) == std::get<1>(resultState), expectedAddr << ": incorrect txCount " << std::get<1>(resultState) << ", expected " << std::get<1>(expectedState));
|
BOOST_ERROR("Missing expected address " << expectedAddr);
|
||||||
BOOST_CHECK_MESSAGE(std::get<3>(expectedState) == std::get<3>(resultState), expectedAddr << ": incorrect code");
|
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");
|
||||||
|
|
||||||
checkStorage(std::get<2>(expectedState), std::get<2>(resultState), expectedAddr);
|
checkStorage(std::get<2>(expectedState), std::get<2>(resultState), expectedAddr);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
checkAddresses<std::map<Address, std::tuple<u256, u256, std::map<u256, u256>, bytes> > >(test.addresses, fev.addresses);
|
checkAddresses<std::map<Address, std::tuple<u256, u256, std::map<u256, u256>, bytes> > >(test.addresses, fev.addresses);
|
||||||
BOOST_CHECK(test.callcreates == fev.callcreates);
|
BOOST_CHECK(test.callcreates == fev.callcreates);
|
||||||
|
|
||||||
|
checkLog(fev.sub.logs, test.sub.logs);
|
||||||
|
}
|
||||||
|
else // Exception expected
|
||||||
|
BOOST_CHECK(vmExceptionOccured);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -432,6 +451,31 @@ BOOST_AUTO_TEST_CASE(vmPushDupSwapTest)
|
|||||||
dev::test::executeTests("vmPushDupSwapTest", "/VMTests", dev::test::doVMTests);
|
dev::test::executeTests("vmPushDupSwapTest", "/VMTests", dev::test::doVMTests);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(vmLogTest)
|
||||||
|
{
|
||||||
|
dev::test::executeTests("vmLogTest", "/VMTests", dev::test::doVMTests);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(vmPerformanceTest)
|
||||||
|
{
|
||||||
|
for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
|
||||||
|
{
|
||||||
|
string arg = boost::unit_test::framework::master_test_suite().argv[i];
|
||||||
|
if (arg == "--performance")
|
||||||
|
dev::test::executeTests("vmPerformanceTest", "/VMTests", dev::test::doVMTests);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(vmArithPerformanceTest)
|
||||||
|
{
|
||||||
|
for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
|
||||||
|
{
|
||||||
|
string arg = boost::unit_test::framework::master_test_suite().argv[i];
|
||||||
|
if (arg == "--performance")
|
||||||
|
dev::test::executeTests("vmArithPerformanceTest", "/VMTests", dev::test::doVMTests);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(vmRandom)
|
BOOST_AUTO_TEST_CASE(vmRandom)
|
||||||
{
|
{
|
||||||
string testPath = getTestPath();
|
string testPath = getTestPath();
|
||||||
|
7
vm.h
7
vm.h
@ -55,8 +55,8 @@ public:
|
|||||||
virtual u256 txCount(Address _a) override { return std::get<1>(addresses[_a]); }
|
virtual u256 txCount(Address _a) override { return std::get<1>(addresses[_a]); }
|
||||||
virtual void suicide(Address _a) override { std::get<0>(addresses[_a]) += std::get<0>(addresses[myAddress]); addresses.erase(myAddress); }
|
virtual void suicide(Address _a) override { std::get<0>(addresses[_a]) += std::get<0>(addresses[myAddress]); addresses.erase(myAddress); }
|
||||||
virtual bytes const& codeAt(Address _a) override { return std::get<3>(addresses[_a]); }
|
virtual bytes const& codeAt(Address _a) override { return std::get<3>(addresses[_a]); }
|
||||||
virtual h160 create(u256 _endowment, u256* _gas, bytesConstRef _init, eth::OnOpFunc const&) override;
|
virtual h160 create(u256 _endowment, u256& io_gas, bytesConstRef _init, eth::OnOpFunc const&) override;
|
||||||
virtual bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, eth::OnOpFunc const&, Address, Address) override;
|
virtual bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256& io_gas, bytesRef _out, eth::OnOpFunc const&, Address, Address) override;
|
||||||
void setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data);
|
void setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data);
|
||||||
void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
|
void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
|
||||||
void set(Address _a, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
|
void set(Address _a, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
|
||||||
@ -80,9 +80,6 @@ public:
|
|||||||
bytes thisTxData;
|
bytes thisTxData;
|
||||||
bytes thisTxCode;
|
bytes thisTxCode;
|
||||||
u256 gas;
|
u256 gas;
|
||||||
|
|
||||||
private:
|
|
||||||
eth::Manifest m_ms;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -338,6 +338,33 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"calldataloadSizeTooHigh": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "1000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ [[ 0 ]] (CALLDATALOAD 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa)}",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"exec" : {
|
||||||
|
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||||
|
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"value" : "1000000000000000000",
|
||||||
|
"data" : "0x123456789abcdef0000000000000000000000000000000000000000000000000024",
|
||||||
|
"gasPrice" : "1000000000",
|
||||||
|
"gas" : "100000000000"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
"calldatasize0": {
|
"calldatasize0": {
|
||||||
"env" : {
|
"env" : {
|
||||||
@ -451,6 +478,62 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"calldatacopy_DataIndexTooHigh": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "1000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 0xff ) [[ 0 ]] @0}",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"exec" : {
|
||||||
|
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||||
|
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"value" : "1000000000000000000",
|
||||||
|
"data" : "0x1234567890abcdef01234567890abcdef",
|
||||||
|
"gasPrice" : "1000000000",
|
||||||
|
"gas" : "100000000000"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
"calldatacopy_DataIndexTooHigh2": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "1000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 9 ) [[ 0 ]] @0}",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"exec" : {
|
||||||
|
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||||
|
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"value" : "1000000000000000000",
|
||||||
|
"data" : "0x1234567890abcdef01234567890abcdef",
|
||||||
|
"gasPrice" : "1000000000",
|
||||||
|
"gas" : "100000000000"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
"calldatacopy1": {
|
"calldatacopy1": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
@ -535,6 +618,34 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"codecopy_DataIndexTooHigh": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "1000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ (CODECOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 8 ) [[ 0 ]] @0}",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"exec" : {
|
||||||
|
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||||
|
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"value" : "1000000000000000000",
|
||||||
|
"data" : "0x1234567890abcdef01234567890abcdef",
|
||||||
|
"gasPrice" : "1000000000",
|
||||||
|
"gas" : "100000000000"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
"codecopy0": {
|
"codecopy0": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
@ -686,6 +797,35 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"extcodecopy_DataIndexTooHigh": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "1000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "{ (EXTCODECOPY (ADDRESS) 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 8 ) [[ 0 ]] @0}",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"exec" : {
|
||||||
|
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||||
|
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"value" : "1000000000000000000",
|
||||||
|
"data" : "0x1234567890abcdef01234567890abcdef",
|
||||||
|
"gasPrice" : "1000000000",
|
||||||
|
"gas" : "100000000000"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
"extcodecopy0": {
|
"extcodecopy0": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"dupAt51doesNotExistAnymore": {
|
"dupAt51becameMload": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
"currentNumber" : "0",
|
"currentNumber" : "0",
|
||||||
@ -83,7 +83,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"swapAt52doesNotExistAnymore": {
|
"swapAt52becameMstore": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
"currentNumber" : "0",
|
"currentNumber" : "0",
|
||||||
|
1294
vmLogTestFiller.json
Normal file
1294
vmLogTestFiller.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -924,7 +924,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"push32error": {
|
"push32AndSuicide": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
"currentNumber" : "0",
|
"currentNumber" : "0",
|
||||||
@ -952,6 +952,35 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
"push32FillUpInputWithZerosAtTheEnd": {
|
||||||
|
"env" : {
|
||||||
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
"currentNumber" : "0",
|
||||||
|
"currentGasLimit" : "1000000",
|
||||||
|
"currentDifficulty" : "256",
|
||||||
|
"currentTimestamp" : 1,
|
||||||
|
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||||
|
},
|
||||||
|
"pre" : {
|
||||||
|
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||||
|
"balance" : "1000000000000000000",
|
||||||
|
"nonce" : 0,
|
||||||
|
"code" : "0x7fff10112233445566778899aabbccddeeff00112233445566778899aabbccdd",
|
||||||
|
"storage": {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"exec" : {
|
||||||
|
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||||
|
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||||
|
"value" : "1000000000000000000",
|
||||||
|
"data" : "",
|
||||||
|
"gasPrice" : "100000000000000",
|
||||||
|
"gas" : "10000"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
"dup1": {
|
"dup1": {
|
||||||
"env" : {
|
"env" : {
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
|
||||||
|
@ -1,588 +1,500 @@
|
|||||||
/**
|
/**
|
||||||
* THIS FILE IS GENERATED BY jsonrpcstub, DO NOT CHANGE IT!!!!!
|
* This file is generated by jsonrpcstub, DO NOT CHANGE IT MANUALLY!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _WEBTHREESTUBCLIENT_H_
|
#ifndef JSONRPC_CPP_STUB_WEBTHREESTUBCLIENT_H_
|
||||||
#define _WEBTHREESTUBCLIENT_H_
|
#define JSONRPC_CPP_STUB_WEBTHREESTUBCLIENT_H_
|
||||||
|
|
||||||
#include <jsonrpc/rpc.h>
|
#include <jsonrpccpp/client.h>
|
||||||
|
|
||||||
class WebThreeStubClient
|
class WebThreeStubClient : public jsonrpc::Client
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
WebThreeStubClient(jsonrpc::AbstractClientConnector* conn)
|
WebThreeStubClient(jsonrpc::IClientConnector &conn) : jsonrpc::Client(conn) {}
|
||||||
{
|
|
||||||
this->client = new jsonrpc::Client(conn);
|
|
||||||
}
|
|
||||||
~WebThreeStubClient()
|
|
||||||
{
|
|
||||||
delete this->client;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string db_get(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
p.append(param2);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("db_get",p);
|
|
||||||
if (result.isString())
|
|
||||||
return result.asString();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string db_getString(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
p.append(param2);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("db_getString",p);
|
|
||||||
if (result.isString())
|
|
||||||
return result.asString();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool db_put(const std::string& param1, const std::string& param2, const std::string& param3) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
p.append(param2);
|
|
||||||
p.append(param3);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("db_put",p);
|
|
||||||
if (result.isBool())
|
|
||||||
return result.asBool();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool db_putString(const std::string& param1, const std::string& param2, const std::string& param3) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
p.append(param2);
|
|
||||||
p.append(param3);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("db_putString",p);
|
|
||||||
if (result.isBool())
|
|
||||||
return result.asBool();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Json::Value eth_accounts() throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p = Json::nullValue;
|
|
||||||
Json::Value result = this->client->CallMethod("eth_accounts",p);
|
|
||||||
if (result.isArray())
|
|
||||||
return result;
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string eth_balanceAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_balanceAt",p);
|
|
||||||
if (result.isString())
|
|
||||||
return result.asString();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Json::Value eth_blockByHash(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_blockByHash",p);
|
|
||||||
if (result.isObject())
|
|
||||||
return result;
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Json::Value eth_blockByNumber(const int& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_blockByNumber",p);
|
|
||||||
if (result.isObject())
|
|
||||||
return result;
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string eth_call(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_call",p);
|
|
||||||
if (result.isString())
|
|
||||||
return result.asString();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool eth_changed(const int& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_changed",p);
|
|
||||||
if (result.isBool())
|
|
||||||
return result.asBool();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string eth_codeAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_codeAt",p);
|
|
||||||
if (result.isString())
|
|
||||||
return result.asString();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string eth_coinbase() throw (jsonrpc::JsonRpcException)
|
std::string eth_coinbase() throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p = Json::nullValue;
|
p = Json::nullValue;
|
||||||
Json::Value result = this->client->CallMethod("eth_coinbase",p);
|
Json::Value result = this->CallMethod("eth_coinbase",p);
|
||||||
if (result.isString())
|
if (result.isString())
|
||||||
return result.asString();
|
return result.asString();
|
||||||
else
|
else
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string eth_compile(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_compile",p);
|
|
||||||
if (result.isString())
|
|
||||||
return result.asString();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
double eth_countAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_countAt",p);
|
|
||||||
if (result.isDouble())
|
|
||||||
return result.asDouble();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int eth_defaultBlock() throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p = Json::nullValue;
|
|
||||||
Json::Value result = this->client->CallMethod("eth_defaultBlock",p);
|
|
||||||
if (result.isInt())
|
|
||||||
return result.asInt();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string eth_gasPrice() throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p = Json::nullValue;
|
|
||||||
Json::Value result = this->client->CallMethod("eth_gasPrice",p);
|
|
||||||
if (result.isString())
|
|
||||||
return result.asString();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Json::Value eth_getMessages(const int& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_getMessages",p);
|
|
||||||
if (result.isArray())
|
|
||||||
return result;
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool eth_listening() throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p = Json::nullValue;
|
|
||||||
Json::Value result = this->client->CallMethod("eth_listening",p);
|
|
||||||
if (result.isBool())
|
|
||||||
return result.asBool();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string eth_lll(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_lll",p);
|
|
||||||
if (result.isString())
|
|
||||||
return result.asString();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool eth_mining() throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p = Json::nullValue;
|
|
||||||
Json::Value result = this->client->CallMethod("eth_mining",p);
|
|
||||||
if (result.isBool())
|
|
||||||
return result.asBool();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int eth_newFilter(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_newFilter",p);
|
|
||||||
if (result.isInt())
|
|
||||||
return result.asInt();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int eth_newFilterString(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p.append(param1);
|
|
||||||
|
|
||||||
Json::Value result = this->client->CallMethod("eth_newFilterString",p);
|
|
||||||
if (result.isInt())
|
|
||||||
return result.asInt();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int eth_number() throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p = Json::nullValue;
|
|
||||||
Json::Value result = this->client->CallMethod("eth_number",p);
|
|
||||||
if (result.isInt())
|
|
||||||
return result.asInt();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int eth_peerCount() throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
|
||||||
Json::Value p;
|
|
||||||
p = Json::nullValue;
|
|
||||||
Json::Value result = this->client->CallMethod("eth_peerCount",p);
|
|
||||||
if (result.isInt())
|
|
||||||
return result.asInt();
|
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
bool eth_setCoinbase(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
bool eth_setCoinbase(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_setCoinbase",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_setCoinbase",p);
|
if (result.isBool())
|
||||||
if (result.isBool())
|
return result.asBool();
|
||||||
return result.asBool();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
bool eth_listening() throw (jsonrpc::JsonRpcException)
|
||||||
bool eth_setDefaultBlock(const int& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p = Json::nullValue;
|
||||||
|
Json::Value result = this->CallMethod("eth_listening",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_setDefaultBlock",p);
|
if (result.isBool())
|
||||||
if (result.isBool())
|
return result.asBool();
|
||||||
return result.asBool();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool eth_setListening(const bool& param1) throw (jsonrpc::JsonRpcException)
|
bool eth_setListening(const bool& param1) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_setListening",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_setListening",p);
|
if (result.isBool())
|
||||||
if (result.isBool())
|
return result.asBool();
|
||||||
return result.asBool();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
}
|
||||||
|
bool eth_mining() throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p = Json::nullValue;
|
||||||
|
Json::Value result = this->CallMethod("eth_mining",p);
|
||||||
|
if (result.isBool())
|
||||||
|
return result.asBool();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool eth_setMining(const bool& param1) throw (jsonrpc::JsonRpcException)
|
bool eth_setMining(const bool& param1) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_setMining",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_setMining",p);
|
if (result.isBool())
|
||||||
if (result.isBool())
|
return result.asBool();
|
||||||
return result.asBool();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
}
|
||||||
|
std::string eth_gasPrice() throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p = Json::nullValue;
|
||||||
|
Json::Value result = this->CallMethod("eth_gasPrice",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
Json::Value eth_accounts() throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p = Json::nullValue;
|
||||||
|
Json::Value result = this->CallMethod("eth_accounts",p);
|
||||||
|
if (result.isArray())
|
||||||
|
return result;
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
int eth_peerCount() throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p = Json::nullValue;
|
||||||
|
Json::Value result = this->CallMethod("eth_peerCount",p);
|
||||||
|
if (result.isInt())
|
||||||
|
return result.asInt();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
int eth_defaultBlock() throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p = Json::nullValue;
|
||||||
|
Json::Value result = this->CallMethod("eth_defaultBlock",p);
|
||||||
|
if (result.isInt())
|
||||||
|
return result.asInt();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
bool eth_setDefaultBlock(const int& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_setDefaultBlock",p);
|
||||||
|
if (result.isBool())
|
||||||
|
return result.asBool();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
int eth_number() throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p = Json::nullValue;
|
||||||
|
Json::Value result = this->CallMethod("eth_number",p);
|
||||||
|
if (result.isInt())
|
||||||
|
return result.asInt();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
std::string eth_balanceAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_balanceAt",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string eth_stateAt(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
std::string eth_stateAt(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
p.append(param2);
|
p.append(param2);
|
||||||
|
Json::Value result = this->CallMethod("eth_stateAt",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_stateAt",p);
|
if (result.isString())
|
||||||
if (result.isString())
|
return result.asString();
|
||||||
return result.asString();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
}
|
||||||
|
Json::Value eth_storageAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_storageAt",p);
|
||||||
|
if (result.isObject())
|
||||||
|
return result;
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
double eth_countAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_countAt",p);
|
||||||
|
if (result.isDouble())
|
||||||
|
return result.asDouble();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
std::string eth_codeAt(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_codeAt",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string eth_transact(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
std::string eth_transact(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_transact",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_transact",p);
|
if (result.isString())
|
||||||
if (result.isString())
|
return result.asString();
|
||||||
return result.asString();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
}
|
||||||
|
std::string eth_call(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_call",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
Json::Value eth_blockByHash(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_blockByHash",p);
|
||||||
|
if (result.isObject())
|
||||||
|
return result;
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
Json::Value eth_blockByNumber(const int& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_blockByNumber",p);
|
||||||
|
if (result.isObject())
|
||||||
|
return result;
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
}
|
}
|
||||||
|
|
||||||
Json::Value eth_transactionByHash(const std::string& param1, const int& param2) throw (jsonrpc::JsonRpcException)
|
Json::Value eth_transactionByHash(const std::string& param1, const int& param2) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
p.append(param2);
|
p.append(param2);
|
||||||
|
Json::Value result = this->CallMethod("eth_transactionByHash",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_transactionByHash",p);
|
if (result.isObject())
|
||||||
if (result.isObject())
|
return result;
|
||||||
return result;
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Json::Value eth_transactionByNumber(const int& param1, const int& param2) throw (jsonrpc::JsonRpcException)
|
Json::Value eth_transactionByNumber(const int& param1, const int& param2) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
p.append(param2);
|
p.append(param2);
|
||||||
|
Json::Value result = this->CallMethod("eth_transactionByNumber",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_transactionByNumber",p);
|
if (result.isObject())
|
||||||
if (result.isObject())
|
return result;
|
||||||
return result;
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Json::Value eth_uncleByHash(const std::string& param1, const int& param2) throw (jsonrpc::JsonRpcException)
|
Json::Value eth_uncleByHash(const std::string& param1, const int& param2) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
p.append(param2);
|
p.append(param2);
|
||||||
|
Json::Value result = this->CallMethod("eth_uncleByHash",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_uncleByHash",p);
|
if (result.isObject())
|
||||||
if (result.isObject())
|
return result;
|
||||||
return result;
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Json::Value eth_uncleByNumber(const int& param1, const int& param2) throw (jsonrpc::JsonRpcException)
|
Json::Value eth_uncleByNumber(const int& param1, const int& param2) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
p.append(param2);
|
p.append(param2);
|
||||||
|
Json::Value result = this->CallMethod("eth_uncleByNumber",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_uncleByNumber",p);
|
if (result.isObject())
|
||||||
if (result.isObject())
|
return result;
|
||||||
return result;
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
}
|
||||||
|
Json::Value eth_compilers() throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p = Json::nullValue;
|
||||||
|
Json::Value result = this->CallMethod("eth_compilers",p);
|
||||||
|
if (result.isArray())
|
||||||
|
return result;
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
std::string eth_lll(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_lll",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
std::string eth_solidity(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_solidity",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
std::string eth_serpent(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_serpent",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
int eth_newFilter(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_newFilter",p);
|
||||||
|
if (result.isInt())
|
||||||
|
return result.asInt();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
int eth_newFilterString(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_newFilterString",p);
|
||||||
|
if (result.isInt())
|
||||||
|
return result.asInt();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool eth_uninstallFilter(const int& param1) throw (jsonrpc::JsonRpcException)
|
bool eth_uninstallFilter(const int& param1) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_uninstallFilter",p);
|
||||||
Json::Value result = this->client->CallMethod("eth_uninstallFilter",p);
|
if (result.isBool())
|
||||||
if (result.isBool())
|
return result.asBool();
|
||||||
return result.asBool();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
bool eth_changed(const int& param1) throw (jsonrpc::JsonRpcException)
|
||||||
std::string shh_addToGroup(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
p.append(param2);
|
Json::Value result = this->CallMethod("eth_changed",p);
|
||||||
|
if (result.isBool())
|
||||||
Json::Value result = this->client->CallMethod("shh_addToGroup",p);
|
return result.asBool();
|
||||||
if (result.isString())
|
else
|
||||||
return result.asString();
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
else
|
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Json::Value eth_filterLogs(const int& param1) throw (jsonrpc::JsonRpcException)
|
||||||
Json::Value shh_changed(const int& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_filterLogs",p);
|
||||||
Json::Value result = this->client->CallMethod("shh_changed",p);
|
if (result.isArray())
|
||||||
if (result.isArray())
|
return result;
|
||||||
return result;
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Json::Value eth_logs(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
||||||
bool shh_haveIdentity(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("eth_logs",p);
|
||||||
Json::Value result = this->client->CallMethod("shh_haveIdentity",p);
|
if (result.isArray())
|
||||||
if (result.isBool())
|
return result;
|
||||||
return result.asBool();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
bool db_put(const std::string& param1, const std::string& param2, const std::string& param3) throw (jsonrpc::JsonRpcException)
|
||||||
int shh_newFilter(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
p.append(param2);
|
||||||
Json::Value result = this->client->CallMethod("shh_newFilter",p);
|
p.append(param3);
|
||||||
if (result.isInt())
|
Json::Value result = this->CallMethod("db_put",p);
|
||||||
return result.asInt();
|
if (result.isBool())
|
||||||
else
|
return result.asBool();
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
}
|
}
|
||||||
|
std::string db_get(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
||||||
std::string shh_newGroup(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
p.append(param2);
|
p.append(param2);
|
||||||
|
Json::Value result = this->CallMethod("db_get",p);
|
||||||
Json::Value result = this->client->CallMethod("shh_newGroup",p);
|
if (result.isString())
|
||||||
if (result.isString())
|
return result.asString();
|
||||||
return result.asString();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
bool db_putString(const std::string& param1, const std::string& param2, const std::string& param3) throw (jsonrpc::JsonRpcException)
|
||||||
std::string shh_newIdentity() throw (jsonrpc::JsonRpcException)
|
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p = Json::nullValue;
|
p.append(param1);
|
||||||
Json::Value result = this->client->CallMethod("shh_newIdentity",p);
|
p.append(param2);
|
||||||
if (result.isString())
|
p.append(param3);
|
||||||
return result.asString();
|
Json::Value result = this->CallMethod("db_putString",p);
|
||||||
else
|
if (result.isBool())
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
return result.asBool();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
std::string db_getString(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
p.append(param2);
|
||||||
|
Json::Value result = this->CallMethod("db_getString",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool shh_post(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
bool shh_post(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("shh_post",p);
|
||||||
Json::Value result = this->client->CallMethod("shh_post",p);
|
if (result.isBool())
|
||||||
if (result.isBool())
|
return result.asBool();
|
||||||
return result.asBool();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
}
|
||||||
|
std::string shh_newIdentity() throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p = Json::nullValue;
|
||||||
|
Json::Value result = this->CallMethod("shh_newIdentity",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
bool shh_haveIdentity(const std::string& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("shh_haveIdentity",p);
|
||||||
|
if (result.isBool())
|
||||||
|
return result.asBool();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
std::string shh_newGroup(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
p.append(param2);
|
||||||
|
Json::Value result = this->CallMethod("shh_newGroup",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
std::string shh_addToGroup(const std::string& param1, const std::string& param2) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
p.append(param2);
|
||||||
|
Json::Value result = this->CallMethod("shh_addToGroup",p);
|
||||||
|
if (result.isString())
|
||||||
|
return result.asString();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
|
}
|
||||||
|
int shh_newFilter(const Json::Value& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("shh_newFilter",p);
|
||||||
|
if (result.isInt())
|
||||||
|
return result.asInt();
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool shh_uninstallFilter(const int& param1) throw (jsonrpc::JsonRpcException)
|
bool shh_uninstallFilter(const int& param1) throw (jsonrpc::JsonRpcException)
|
||||||
{
|
{
|
||||||
Json::Value p;
|
Json::Value p;
|
||||||
p.append(param1);
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("shh_uninstallFilter",p);
|
||||||
Json::Value result = this->client->CallMethod("shh_uninstallFilter",p);
|
if (result.isBool())
|
||||||
if (result.isBool())
|
return result.asBool();
|
||||||
return result.asBool();
|
else
|
||||||
else
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
}
|
||||||
|
Json::Value shh_changed(const int& param1) throw (jsonrpc::JsonRpcException)
|
||||||
|
{
|
||||||
|
Json::Value p;
|
||||||
|
p.append(param1);
|
||||||
|
Json::Value result = this->CallMethod("shh_changed",p);
|
||||||
|
if (result.isArray())
|
||||||
|
return result;
|
||||||
|
else
|
||||||
|
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
|
||||||
jsonrpc::Client* client;
|
|
||||||
};
|
};
|
||||||
#endif //_WEBTHREESTUBCLIENT_H_
|
|
||||||
|
#endif //JSONRPC_CPP_WEBTHREESTUBCLIENT_H_
|
||||||
|
@ -32,6 +32,8 @@ BOOST_AUTO_TEST_SUITE(whisper)
|
|||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(topic)
|
BOOST_AUTO_TEST_CASE(topic)
|
||||||
{
|
{
|
||||||
|
cnote << "Testing Whisper...";
|
||||||
|
auto oldLogVerbosity = g_logVerbosity;
|
||||||
g_logVerbosity = 0;
|
g_logVerbosity = 0;
|
||||||
|
|
||||||
bool started = false;
|
bool started = false;
|
||||||
@ -40,16 +42,16 @@ BOOST_AUTO_TEST_CASE(topic)
|
|||||||
{
|
{
|
||||||
setThreadName("other");
|
setThreadName("other");
|
||||||
|
|
||||||
Host ph("Test", NetworkPreferences(30303, "", false, true));
|
Host ph("Test", NetworkPreferences(50303, "", false, true));
|
||||||
auto wh = ph.registerCapability(new WhisperHost());
|
auto wh = ph.registerCapability(new WhisperHost());
|
||||||
ph.start();
|
ph.start();
|
||||||
|
|
||||||
started = true;
|
started = true;
|
||||||
|
|
||||||
/// Only interested in odd packets
|
/// Only interested in odd packets
|
||||||
auto w = wh->installWatch(BuildTopicMask()("odd"));
|
auto w = wh->installWatch(BuildTopicMask("odd"));
|
||||||
|
|
||||||
for (int i = 0, last = 0; i < 100 && last < 81; ++i)
|
for (int i = 0, last = 0; i < 200 && last < 81; ++i)
|
||||||
{
|
{
|
||||||
for (auto i: wh->checkWatch(w))
|
for (auto i: wh->checkWatch(w))
|
||||||
{
|
{
|
||||||
@ -65,10 +67,12 @@ BOOST_AUTO_TEST_CASE(topic)
|
|||||||
while (!started)
|
while (!started)
|
||||||
this_thread::sleep_for(chrono::milliseconds(50));
|
this_thread::sleep_for(chrono::milliseconds(50));
|
||||||
|
|
||||||
Host ph("Test", NetworkPreferences(30300, "", false, true));
|
Host ph("Test", NetworkPreferences(50300, "", false, true));
|
||||||
auto wh = ph.registerCapability(new WhisperHost());
|
auto wh = ph.registerCapability(new WhisperHost());
|
||||||
|
this_thread::sleep_for(chrono::milliseconds(500));
|
||||||
ph.start();
|
ph.start();
|
||||||
ph.connect("127.0.0.1", 30303);
|
this_thread::sleep_for(chrono::milliseconds(500));
|
||||||
|
ph.connect("127.0.0.1", 50303);
|
||||||
|
|
||||||
KeyPair us = KeyPair::create();
|
KeyPair us = KeyPair::create();
|
||||||
for (int i = 0; i < 10; ++i)
|
for (int i = 0; i < 10; ++i)
|
||||||
@ -78,6 +82,8 @@ BOOST_AUTO_TEST_CASE(topic)
|
|||||||
}
|
}
|
||||||
|
|
||||||
listener.join();
|
listener.join();
|
||||||
|
g_logVerbosity = oldLogVerbosity;
|
||||||
|
|
||||||
BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81);
|
BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user