arkpar
10 years ago
66 changed files with 2476 additions and 714 deletions
@ -0,0 +1,27 @@ |
|||
/*
|
|||
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 ABI.cpp
|
|||
* @author Gav Wood <i@gavwood.com> |
|||
* @date 2014 |
|||
*/ |
|||
|
|||
#include "ABI.h" |
|||
|
|||
using namespace std; |
|||
using namespace dev; |
|||
using namespace dev::eth; |
|||
|
|||
@ -0,0 +1,64 @@ |
|||
/*
|
|||
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 ABI.h
|
|||
* @author Gav Wood <i@gavwood.com> |
|||
* @date 2014 |
|||
*/ |
|||
|
|||
#pragma once |
|||
|
|||
#include <libdevcore/Common.h> |
|||
#include <libdevcore/FixedHash.h> |
|||
#include <libdevcore/CommonData.h> |
|||
#include <libdevcrypto/SHA3.h> |
|||
|
|||
namespace dev |
|||
{ |
|||
namespace eth |
|||
{ |
|||
|
|||
template <class T> struct ABISerialiser {}; |
|||
template <unsigned N> struct ABISerialiser<FixedHash<N>> { static bytes serialise(FixedHash<N> const& _t) { static_assert(N <= 32, "Cannot serialise hash > 32 bytes."); static_assert(N > 0, "Cannot serialise zero-length hash."); return bytes(32 - N, 0) + _t.asBytes(); } }; |
|||
template <> struct ABISerialiser<u256> { static bytes serialise(u256 const& _t) { return h256(_t).asBytes(); } }; |
|||
template <> struct ABISerialiser<u160> { static bytes serialise(u160 const& _t) { return bytes(12, 0) + h160(_t).asBytes(); } }; |
|||
template <> struct ABISerialiser<string32> { static bytes serialise(string32 const& _t) { return bytesConstRef((byte const*)_t.data(), 32).toBytes(); } }; |
|||
|
|||
inline bytes abiInAux() { return {}; } |
|||
template <class T, class ... U> bytes abiInAux(T const& _t, U const& ... _u) |
|||
{ |
|||
return ABISerialiser<T>::serialise(_t) + abiInAux(_u ...); |
|||
} |
|||
|
|||
template <class ... T> bytes abiIn(std::string _id, T const& ... _t) |
|||
{ |
|||
return sha3(_id).ref().cropped(0, 4).toBytes() + abiInAux(_t ...); |
|||
} |
|||
|
|||
template <class T> struct ABIDeserialiser {}; |
|||
template <unsigned N> struct ABIDeserialiser<FixedHash<N>> { static FixedHash<N> deserialise(bytesConstRef& io_t) { static_assert(N <= 32, "Parameter sizes must be at most 32 bytes."); FixedHash<N> ret; io_t.cropped(32 - N, N).populate(ret.ref()); io_t = io_t.cropped(32); return ret; } }; |
|||
template <> struct ABIDeserialiser<u256> { static u256 deserialise(bytesConstRef& io_t) { u256 ret = fromBigEndian<u256>(io_t.cropped(0, 32)); io_t = io_t.cropped(32); return ret; } }; |
|||
template <> struct ABIDeserialiser<u160> { static u160 deserialise(bytesConstRef& io_t) { u160 ret = fromBigEndian<u160>(io_t.cropped(12, 20)); io_t = io_t.cropped(32); return ret; } }; |
|||
template <> struct ABIDeserialiser<string32> { static string32 deserialise(bytesConstRef& io_t) { string32 ret; io_t.cropped(0, 32).populate(bytesRef((byte*)ret.data(), 32)); io_t = io_t.cropped(32); return ret; } }; |
|||
|
|||
template <class T> T abiOut(bytes const& _data) |
|||
{ |
|||
bytesConstRef o(&_data); |
|||
return ABIDeserialiser<T>::deserialise(o); |
|||
} |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,135 @@ |
|||
/*
|
|||
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 Assembly.cpp
|
|||
* @author Gav Wood <i@gavwood.com> |
|||
* @date 2014 |
|||
*/ |
|||
|
|||
#include "AssemblyItem.h" |
|||
#include <fstream> |
|||
|
|||
using namespace std; |
|||
using namespace dev; |
|||
using namespace dev::eth; |
|||
|
|||
unsigned AssemblyItem::bytesRequired(unsigned _addressLength) const |
|||
{ |
|||
switch (m_type) |
|||
{ |
|||
case Operation: |
|||
case Tag: // 1 byte for the JUMPDEST
|
|||
return 1; |
|||
case PushString: |
|||
return 33; |
|||
case Push: |
|||
return 1 + max<unsigned>(1, dev::bytesRequired(m_data)); |
|||
case PushSubSize: |
|||
case PushProgramSize: |
|||
return 4; // worst case: a 16MB program
|
|||
case PushTag: |
|||
case PushData: |
|||
case PushSub: |
|||
return 1 + _addressLength; |
|||
default: |
|||
break; |
|||
} |
|||
BOOST_THROW_EXCEPTION(InvalidOpcode()); |
|||
} |
|||
|
|||
int AssemblyItem::deposit() const |
|||
{ |
|||
switch (m_type) |
|||
{ |
|||
case Operation: |
|||
return instructionInfo(instruction()).ret - instructionInfo(instruction()).args; |
|||
case Push: |
|||
case PushString: |
|||
case PushTag: |
|||
case PushData: |
|||
case PushSub: |
|||
case PushSubSize: |
|||
case PushProgramSize: |
|||
return 1; |
|||
case Tag: |
|||
return 0; |
|||
default:; |
|||
} |
|||
return 0; |
|||
} |
|||
|
|||
string AssemblyItem::getJumpTypeAsString() const |
|||
{ |
|||
switch (m_jumpType) |
|||
{ |
|||
case JumpType::IntoFunction: |
|||
return "[in]"; |
|||
case JumpType::OutOfFunction: |
|||
return "[out]"; |
|||
case JumpType::Ordinary: |
|||
default: |
|||
return ""; |
|||
} |
|||
} |
|||
|
|||
ostream& dev::eth::operator<<(ostream& _out, AssemblyItem const& _item) |
|||
{ |
|||
switch (_item.type()) |
|||
{ |
|||
case Operation: |
|||
_out << " " << instructionInfo(_item.instruction()).name; |
|||
if (_item.instruction() == eth::Instruction::JUMP || _item.instruction() == eth::Instruction::JUMPI) |
|||
_out << "\t" << _item.getJumpTypeAsString(); |
|||
break; |
|||
case Push: |
|||
_out << " PUSH " << hex << _item.data(); |
|||
break; |
|||
case PushString: |
|||
_out << " PushString" << hex << (unsigned)_item.data(); |
|||
break; |
|||
case PushTag: |
|||
_out << " PushTag " << _item.data(); |
|||
break; |
|||
case Tag: |
|||
_out << " Tag " << _item.data(); |
|||
break; |
|||
case PushData: |
|||
_out << " PushData " << hex << (unsigned)_item.data(); |
|||
break; |
|||
case PushSub: |
|||
_out << " PushSub " << hex << h256(_item.data()).abridged(); |
|||
break; |
|||
case PushSubSize: |
|||
_out << " PushSubSize " << hex << h256(_item.data()).abridged(); |
|||
break; |
|||
case PushProgramSize: |
|||
_out << " PushProgramSize"; |
|||
break; |
|||
case UndefinedItem: |
|||
_out << " ???"; |
|||
break; |
|||
default: |
|||
BOOST_THROW_EXCEPTION(InvalidOpcode()); |
|||
} |
|||
return _out; |
|||
} |
|||
|
|||
ostream& dev::eth::operator<<(ostream& _out, AssemblyItemsConstRef _i) |
|||
{ |
|||
for (AssemblyItem const& i: _i) |
|||
_out << i; |
|||
return _out; |
|||
} |
|||
@ -0,0 +1,92 @@ |
|||
/*
|
|||
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 Assembly.h
|
|||
* @author Gav Wood <i@gavwood.com> |
|||
* @date 2014 |
|||
*/ |
|||
|
|||
#pragma once |
|||
|
|||
#include <iostream> |
|||
#include <sstream> |
|||
#include <libdevcore/Common.h> |
|||
#include <libdevcore/Assertions.h> |
|||
#include <libevmcore/SourceLocation.h> |
|||
#include <libevmcore/Instruction.h> |
|||
#include "Exceptions.h" |
|||
|
|||
namespace dev |
|||
{ |
|||
namespace eth |
|||
{ |
|||
|
|||
enum AssemblyItemType { UndefinedItem, Operation, Push, PushString, PushTag, PushSub, PushSubSize, PushProgramSize, Tag, PushData }; |
|||
|
|||
class Assembly; |
|||
|
|||
class AssemblyItem |
|||
{ |
|||
friend class Assembly; |
|||
|
|||
public: |
|||
enum class JumpType { Ordinary, IntoFunction, OutOfFunction }; |
|||
|
|||
AssemblyItem(u256 _push): m_type(Push), m_data(_push) {} |
|||
AssemblyItem(Instruction _i): m_type(Operation), m_data((byte)_i) {} |
|||
AssemblyItem(AssemblyItemType _type, u256 _data = 0): m_type(_type), m_data(_data) {} |
|||
|
|||
AssemblyItem tag() const { assertThrow(m_type == PushTag || m_type == Tag, Exception, ""); return AssemblyItem(Tag, m_data); } |
|||
AssemblyItem pushTag() const { assertThrow(m_type == PushTag || m_type == Tag, Exception, ""); return AssemblyItem(PushTag, m_data); } |
|||
|
|||
AssemblyItemType type() const { return m_type; } |
|||
u256 const& data() const { return m_data; } |
|||
/// @returns the instruction of this item (only valid if type() == Operation)
|
|||
Instruction instruction() const { return Instruction(byte(m_data)); } |
|||
|
|||
/// @returns true iff the type and data of the items are equal.
|
|||
bool operator==(AssemblyItem const& _other) const { return m_type == _other.m_type && m_data == _other.m_data; } |
|||
bool operator!=(AssemblyItem const& _other) const { return !operator==(_other); } |
|||
|
|||
/// @returns an upper bound for the number of bytes required by this item, assuming that
|
|||
/// the value of a jump tag takes @a _addressLength bytes.
|
|||
unsigned bytesRequired(unsigned _addressLength) const; |
|||
int deposit() const; |
|||
|
|||
bool match(AssemblyItem const& _i) const { return _i.m_type == UndefinedItem || (m_type == _i.m_type && (m_type != Operation || m_data == _i.m_data)); } |
|||
void setLocation(SourceLocation const& _location) { m_location = _location; } |
|||
SourceLocation const& getLocation() const { return m_location; } |
|||
|
|||
void setJumpType(JumpType _jumpType) { m_jumpType = _jumpType; } |
|||
JumpType getJumpType() const { return m_jumpType; } |
|||
std::string getJumpTypeAsString() const; |
|||
|
|||
private: |
|||
AssemblyItemType m_type; |
|||
u256 m_data; |
|||
SourceLocation m_location; |
|||
JumpType m_jumpType = JumpType::Ordinary; |
|||
}; |
|||
|
|||
using AssemblyItems = std::vector<AssemblyItem>; |
|||
using AssemblyItemsConstRef = vector_ref<AssemblyItem const>; |
|||
|
|||
std::ostream& operator<<(std::ostream& _out, AssemblyItem const& _item); |
|||
std::ostream& operator<<(std::ostream& _out, AssemblyItemsConstRef _i); |
|||
inline std::ostream& operator<<(std::ostream& _out, AssemblyItems const& _i) { return operator<<(_out, AssemblyItemsConstRef(&_i)); } |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,371 @@ |
|||
/*
|
|||
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 ExpressionClasses.cpp |
|||
* @author Christian <c@ethdev.com> |
|||
* @date 2015 |
|||
* Container for equivalence classes of expressions for use in common subexpression elimination. |
|||
*/ |
|||
|
|||
#include <libevmcore/ExpressionClasses.h> |
|||
#include <utility> |
|||
#include <tuple> |
|||
#include <functional> |
|||
#include <boost/range/adaptor/reversed.hpp> |
|||
#include <boost/noncopyable.hpp> |
|||
#include <libevmcore/Assembly.h> |
|||
#include <libevmcore/CommonSubexpressionEliminator.h> |
|||
|
|||
using namespace std; |
|||
using namespace dev; |
|||
using namespace dev::eth; |
|||
|
|||
|
|||
bool ExpressionClasses::Expression::operator<(ExpressionClasses::Expression const& _other) const |
|||
{ |
|||
auto type = item->type(); |
|||
auto otherType = _other.item->type(); |
|||
return std::tie(type, item->data(), arguments) < |
|||
std::tie(otherType, _other.item->data(), _other.arguments); |
|||
} |
|||
|
|||
ExpressionClasses::Id ExpressionClasses::find(AssemblyItem const& _item, Ids const& _arguments) |
|||
{ |
|||
Expression exp; |
|||
exp.id = Id(-1); |
|||
exp.item = &_item; |
|||
exp.arguments = _arguments; |
|||
|
|||
if (SemanticInformation::isCommutativeOperation(_item)) |
|||
sort(exp.arguments.begin(), exp.arguments.end()); |
|||
|
|||
//@todo store all class members (not only the representatives) in an efficient data structure to search here
|
|||
for (Expression const& e: m_representatives) |
|||
if (!(e < exp || exp < e)) |
|||
return e.id; |
|||
|
|||
if (SemanticInformation::isDupInstruction(_item)) |
|||
{ |
|||
// Special item that refers to values pre-existing on the stack
|
|||
m_spareAssemblyItem.push_back(make_shared<AssemblyItem>(_item)); |
|||
exp.item = m_spareAssemblyItem.back().get(); |
|||
} |
|||
|
|||
ExpressionClasses::Id id = tryToSimplify(exp); |
|||
if (id < m_representatives.size()) |
|||
return id; |
|||
|
|||
exp.id = m_representatives.size(); |
|||
m_representatives.push_back(exp); |
|||
return exp.id; |
|||
} |
|||
|
|||
string ExpressionClasses::fullDAGToString(ExpressionClasses::Id _id) const |
|||
{ |
|||
Expression const& expr = representative(_id); |
|||
stringstream str; |
|||
str << dec << expr.id << ":" << *expr.item << "("; |
|||
for (Id arg: expr.arguments) |
|||
str << fullDAGToString(arg) << ","; |
|||
str << ")"; |
|||
return str.str(); |
|||
} |
|||
|
|||
class Rules: public boost::noncopyable |
|||
{ |
|||
public: |
|||
Rules(); |
|||
void resetMatchGroups() { m_matchGroups.clear(); } |
|||
vector<pair<Pattern, function<Pattern()>>> rules() const { return m_rules; } |
|||
|
|||
private: |
|||
using Expression = ExpressionClasses::Expression; |
|||
map<unsigned, Expression const*> m_matchGroups; |
|||
vector<pair<Pattern, function<Pattern()>>> m_rules; |
|||
}; |
|||
|
|||
Rules::Rules() |
|||
{ |
|||
// Multiple occurences of one of these inside one rule must match the same equivalence class.
|
|||
// Constants.
|
|||
Pattern A(Push); |
|||
Pattern B(Push); |
|||
Pattern C(Push); |
|||
// Anything.
|
|||
Pattern X; |
|||
Pattern Y; |
|||
Pattern Z; |
|||
A.setMatchGroup(1, m_matchGroups); |
|||
B.setMatchGroup(2, m_matchGroups); |
|||
C.setMatchGroup(3, m_matchGroups); |
|||
X.setMatchGroup(4, m_matchGroups); |
|||
Y.setMatchGroup(5, m_matchGroups); |
|||
Z.setMatchGroup(6, m_matchGroups); |
|||
|
|||
m_rules = vector<pair<Pattern, function<Pattern()>>>{ |
|||
// arithmetics on constants
|
|||
{{Instruction::ADD, {A, B}}, [=]{ return A.d() + B.d(); }}, |
|||
{{Instruction::MUL, {A, B}}, [=]{ return A.d() * B.d(); }}, |
|||
{{Instruction::SUB, {A, B}}, [=]{ return A.d() - B.d(); }}, |
|||
{{Instruction::DIV, {A, B}}, [=]{ return B.d() == 0 ? 0 : A.d() / B.d(); }}, |
|||
{{Instruction::SDIV, {A, B}}, [=]{ return B.d() == 0 ? 0 : s2u(u2s(A.d()) / u2s(B.d())); }}, |
|||
{{Instruction::MOD, {A, B}}, [=]{ return B.d() == 0 ? 0 : A.d() % B.d(); }}, |
|||
{{Instruction::SMOD, {A, B}}, [=]{ return B.d() == 0 ? 0 : s2u(u2s(A.d()) % u2s(B.d())); }}, |
|||
{{Instruction::EXP, {A, B}}, [=]{ return u256(boost::multiprecision::powm(bigint(A.d()), bigint(B.d()), bigint(1) << 256)); }}, |
|||
{{Instruction::NOT, {A}}, [=]{ return ~A.d(); }}, |
|||
{{Instruction::LT, {A, B}}, [=]() { return A.d() < B.d() ? u256(1) : 0; }}, |
|||
{{Instruction::GT, {A, B}}, [=]() -> u256 { return A.d() > B.d() ? 1 : 0; }}, |
|||
{{Instruction::SLT, {A, B}}, [=]() -> u256 { return u2s(A.d()) < u2s(B.d()) ? 1 : 0; }}, |
|||
{{Instruction::SGT, {A, B}}, [=]() -> u256 { return u2s(A.d()) > u2s(B.d()) ? 1 : 0; }}, |
|||
{{Instruction::EQ, {A, B}}, [=]() -> u256 { return A.d() == B.d() ? 1 : 0; }}, |
|||
{{Instruction::ISZERO, {A}}, [=]() -> u256 { return A.d() == 0 ? 1 : 0; }}, |
|||
{{Instruction::AND, {A, B}}, [=]{ return A.d() & B.d(); }}, |
|||
{{Instruction::OR, {A, B}}, [=]{ return A.d() | B.d(); }}, |
|||
{{Instruction::XOR, {A, B}}, [=]{ return A.d() ^ B.d(); }}, |
|||
{{Instruction::BYTE, {A, B}}, [=]{ return A.d() >= 32 ? 0 : (B.d() >> unsigned(8 * (31 - A.d()))) & 0xff; }}, |
|||
{{Instruction::ADDMOD, {A, B, C}}, [=]{ return C.d() == 0 ? 0 : u256((bigint(A.d()) + bigint(B.d())) % C.d()); }}, |
|||
{{Instruction::MULMOD, {A, B, C}}, [=]{ return C.d() == 0 ? 0 : u256((bigint(A.d()) * bigint(B.d())) % C.d()); }}, |
|||
{{Instruction::MULMOD, {A, B, C}}, [=]{ return A.d() * B.d(); }}, |
|||
{{Instruction::SIGNEXTEND, {A, B}}, [=]() -> u256 { |
|||
if (A.d() >= 31) |
|||
return B.d(); |
|||
unsigned testBit = unsigned(A.d()) * 8 + 7; |
|||
u256 mask = (u256(1) << testBit) - 1; |
|||
return u256(boost::multiprecision::bit_test(B.d(), testBit) ? B.d() | ~mask : B.d() & mask); |
|||
}}, |
|||
|
|||
// invariants involving known constants
|
|||
{{Instruction::ADD, {X, 0}}, [=]{ return X; }}, |
|||
{{Instruction::MUL, {X, 1}}, [=]{ return X; }}, |
|||
{{Instruction::DIV, {X, 1}}, [=]{ return X; }}, |
|||
{{Instruction::SDIV, {X, 1}}, [=]{ return X; }}, |
|||
{{Instruction::OR, {X, 0}}, [=]{ return X; }}, |
|||
{{Instruction::XOR, {X, 0}}, [=]{ return X; }}, |
|||
{{Instruction::AND, {X, ~u256(0)}}, [=]{ return X; }}, |
|||
{{Instruction::MUL, {X, 0}}, [=]{ return u256(0); }}, |
|||
{{Instruction::DIV, {X, 0}}, [=]{ return u256(0); }}, |
|||
{{Instruction::MOD, {X, 0}}, [=]{ return u256(0); }}, |
|||
{{Instruction::MOD, {0, X}}, [=]{ return u256(0); }}, |
|||
{{Instruction::AND, {X, 0}}, [=]{ return u256(0); }}, |
|||
{{Instruction::OR, {X, ~u256(0)}}, [=]{ return ~u256(0); }}, |
|||
// operations involving an expression and itself
|
|||
{{Instruction::AND, {X, X}}, [=]{ return X; }}, |
|||
{{Instruction::OR, {X, X}}, [=]{ return X; }}, |
|||
{{Instruction::SUB, {X, X}}, [=]{ return u256(0); }}, |
|||
{{Instruction::EQ, {X, X}}, [=]{ return u256(1); }}, |
|||
{{Instruction::LT, {X, X}}, [=]{ return u256(0); }}, |
|||
{{Instruction::SLT, {X, X}}, [=]{ return u256(0); }}, |
|||
{{Instruction::GT, {X, X}}, [=]{ return u256(0); }}, |
|||
{{Instruction::SGT, {X, X}}, [=]{ return u256(0); }}, |
|||
{{Instruction::MOD, {X, X}}, [=]{ return u256(0); }}, |
|||
|
|||
{{Instruction::NOT, {{Instruction::NOT, {X}}}}, [=]{ return X; }}, |
|||
}; |
|||
// Associative operations
|
|||
for (auto const& opFun: vector<pair<Instruction,function<u256(u256 const&,u256 const&)>>>{ |
|||
{Instruction::ADD, plus<u256>()}, |
|||
{Instruction::MUL, multiplies<u256>()}, |
|||
{Instruction::AND, bit_and<u256>()}, |
|||
{Instruction::OR, bit_or<u256>()}, |
|||
{Instruction::XOR, bit_xor<u256>()} |
|||
}) |
|||
{ |
|||
auto op = opFun.first; |
|||
auto fun = opFun.second; |
|||
// Moving constants to the outside, order matters here!
|
|||
// we need actions that return expressions (or patterns?) here, and we need also reversed rules
|
|||
// (X+A)+B -> X+(A+B)
|
|||
m_rules.push_back({ |
|||
{op, {{op, {X, A}}, B}}, |
|||
[=]() -> Pattern { return {op, {X, fun(A.d(), B.d())}}; } |
|||
}); |
|||
// X+(Y+A) -> (X+Y)+A
|
|||
m_rules.push_back({ |
|||
{op, {{op, {X, A}}, Y}}, |
|||
[=]() -> Pattern { return {op, {{op, {X, Y}}, A}}; } |
|||
}); |
|||
// For now, we still need explicit commutativity for the inner pattern
|
|||
m_rules.push_back({ |
|||
{op, {{op, {A, X}}, B}}, |
|||
[=]() -> Pattern { return {op, {X, fun(A.d(), B.d())}}; } |
|||
}); |
|||
m_rules.push_back({ |
|||
{op, {{op, {A, X}}, Y}}, |
|||
[=]() -> Pattern { return {op, {{op, {X, Y}}, A}}; } |
|||
}); |
|||
}; |
|||
|
|||
//@todo: (x+8)-3 and other things
|
|||
} |
|||
|
|||
ExpressionClasses::Id ExpressionClasses::tryToSimplify(Expression const& _expr, bool _secondRun) |
|||
{ |
|||
static Rules rules; |
|||
|
|||
if (_expr.item->type() != Operation) |
|||
return -1; |
|||
|
|||
for (auto const& rule: rules.rules()) |
|||
{ |
|||
rules.resetMatchGroups(); |
|||
if (rule.first.matches(_expr, *this)) |
|||
{ |
|||
// Debug info
|
|||
//cout << "Simplifying " << *_expr.item << "(";
|
|||
//for (Id arg: _expr.arguments)
|
|||
// cout << fullDAGToString(arg) << ", ";
|
|||
//cout << ")" << endl;
|
|||
//cout << "with rule " << rule.first.toString() << endl;
|
|||
//ExpressionTemplate t(rule.second());
|
|||
//cout << "to" << rule.second().toString() << endl;
|
|||
return rebuildExpression(ExpressionTemplate(rule.second())); |
|||
} |
|||
} |
|||
|
|||
if (!_secondRun && _expr.arguments.size() == 2 && SemanticInformation::isCommutativeOperation(*_expr.item)) |
|||
{ |
|||
Expression expr = _expr; |
|||
swap(expr.arguments[0], expr.arguments[1]); |
|||
return tryToSimplify(expr, true); |
|||
} |
|||
|
|||
return -1; |
|||
} |
|||
|
|||
ExpressionClasses::Id ExpressionClasses::rebuildExpression(ExpressionTemplate const& _template) |
|||
{ |
|||
if (_template.hasId) |
|||
return _template.id; |
|||
|
|||
Ids arguments; |
|||
for (ExpressionTemplate const& t: _template.arguments) |
|||
arguments.push_back(rebuildExpression(t)); |
|||
m_spareAssemblyItem.push_back(make_shared<AssemblyItem>(_template.item)); |
|||
return find(*m_spareAssemblyItem.back(), arguments); |
|||
} |
|||
|
|||
|
|||
Pattern::Pattern(Instruction _instruction, std::vector<Pattern> const& _arguments): |
|||
m_type(Operation), |
|||
m_requireDataMatch(true), |
|||
m_data(_instruction), |
|||
m_arguments(_arguments) |
|||
{ |
|||
} |
|||
|
|||
void Pattern::setMatchGroup(unsigned _group, map<unsigned, Expression const*>& _matchGroups) |
|||
{ |
|||
m_matchGroup = _group; |
|||
m_matchGroups = &_matchGroups; |
|||
} |
|||
|
|||
bool Pattern::matches(Expression const& _expr, ExpressionClasses const& _classes) const |
|||
{ |
|||
if (!matchesBaseItem(*_expr.item)) |
|||
return false; |
|||
if (m_matchGroup) |
|||
{ |
|||
if (!m_matchGroups->count(m_matchGroup)) |
|||
(*m_matchGroups)[m_matchGroup] = &_expr; |
|||
else if ((*m_matchGroups)[m_matchGroup]->id != _expr.id) |
|||
return false; |
|||
} |
|||
assertThrow(m_arguments.size() == 0 || _expr.arguments.size() == m_arguments.size(), OptimizerException, ""); |
|||
for (size_t i = 0; i < m_arguments.size(); ++i) |
|||
if (!m_arguments[i].matches(_classes.representative(_expr.arguments[i]), _classes)) |
|||
return false; |
|||
return true; |
|||
} |
|||
|
|||
string Pattern::toString() const |
|||
{ |
|||
stringstream s; |
|||
switch (m_type) |
|||
{ |
|||
case Operation: |
|||
s << instructionInfo(Instruction(unsigned(m_data))).name; |
|||
break; |
|||
case Push: |
|||
s << "PUSH " << hex << m_data; |
|||
break; |
|||
case UndefinedItem: |
|||
s << "ANY"; |
|||
break; |
|||
default: |
|||
s << "t=" << dec << m_type << " d=" << hex << m_data; |
|||
break; |
|||
} |
|||
if (!m_requireDataMatch) |
|||
s << " ~"; |
|||
if (m_matchGroup) |
|||
s << "[" << dec << m_matchGroup << "]"; |
|||
s << "("; |
|||
for (Pattern const& p: m_arguments) |
|||
s << p.toString() << ", "; |
|||
s << ")"; |
|||
return s.str(); |
|||
} |
|||
|
|||
bool Pattern::matchesBaseItem(AssemblyItem const& _item) const |
|||
{ |
|||
if (m_type == UndefinedItem) |
|||
return true; |
|||
if (m_type != _item.type()) |
|||
return false; |
|||
if (m_requireDataMatch && m_data != _item.data()) |
|||
return false; |
|||
return true; |
|||
} |
|||
|
|||
Pattern::Expression const& Pattern::matchGroupValue() const |
|||
{ |
|||
assertThrow(m_matchGroup > 0, OptimizerException, ""); |
|||
assertThrow(!!m_matchGroups, OptimizerException, ""); |
|||
assertThrow((*m_matchGroups)[m_matchGroup], OptimizerException, ""); |
|||
return *(*m_matchGroups)[m_matchGroup]; |
|||
} |
|||
|
|||
|
|||
ExpressionTemplate::ExpressionTemplate(Pattern const& _pattern) |
|||
{ |
|||
if (_pattern.matchGroup()) |
|||
{ |
|||
hasId = true; |
|||
id = _pattern.id(); |
|||
} |
|||
else |
|||
{ |
|||
hasId = false; |
|||
item = _pattern.toAssemblyItem(); |
|||
} |
|||
for (auto const& arg: _pattern.arguments()) |
|||
arguments.push_back(ExpressionTemplate(arg)); |
|||
} |
|||
|
|||
string ExpressionTemplate::toString() const |
|||
{ |
|||
stringstream s; |
|||
if (hasId) |
|||
s << id; |
|||
else |
|||
s << item; |
|||
s << "("; |
|||
for (auto const& arg: arguments) |
|||
s << arg.toString(); |
|||
s << ")"; |
|||
return s.str(); |
|||
} |
|||
@ -0,0 +1,150 @@ |
|||
/*
|
|||
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 ExpressionClasses.h |
|||
* @author Christian <c@ethdev.com> |
|||
* @date 2015 |
|||
* Container for equivalence classes of expressions for use in common subexpression elimination. |
|||
*/ |
|||
|
|||
#pragma once |
|||
|
|||
#include <vector> |
|||
#include <map> |
|||
#include <memory> |
|||
#include <libdevcore/Common.h> |
|||
#include <libevmcore/AssemblyItem.h> |
|||
|
|||
namespace dev |
|||
{ |
|||
namespace eth |
|||
{ |
|||
|
|||
class Pattern; |
|||
struct ExpressionTemplate; |
|||
|
|||
/**
|
|||
* Collection of classes of equivalent expressions that can also determine the class of an expression. |
|||
* Identifiers are contiguously assigned to new classes starting from zero. |
|||
*/ |
|||
class ExpressionClasses |
|||
{ |
|||
public: |
|||
using Id = unsigned; |
|||
using Ids = std::vector<Id>; |
|||
|
|||
struct Expression |
|||
{ |
|||
Id id; |
|||
AssemblyItem const* item; |
|||
Ids arguments; |
|||
bool operator<(Expression const& _other) const; |
|||
}; |
|||
|
|||
/// Retrieves the id of the expression equivalence class resulting from the given item applied to the
|
|||
/// given classes, might also create a new one.
|
|||
Id find(AssemblyItem const& _item, Ids const& _arguments = {}); |
|||
/// @returns the canonical representative of an expression class.
|
|||
Expression const& representative(Id _id) const { return m_representatives.at(_id); } |
|||
/// @returns the number of classes.
|
|||
Id size() const { return m_representatives.size(); } |
|||
|
|||
std::string fullDAGToString(Id _id) const; |
|||
|
|||
private: |
|||
/// Tries to simplify the given expression.
|
|||
/// @returns its class if it possible or Id(-1) otherwise.
|
|||
/// @param _secondRun is set to true for the second run where arguments of commutative expressions are reversed
|
|||
Id tryToSimplify(Expression const& _expr, bool _secondRun = false); |
|||
|
|||
/// Rebuilds an expression from a (matched) pattern.
|
|||
Id rebuildExpression(ExpressionTemplate const& _template); |
|||
|
|||
std::vector<std::pair<Pattern, std::function<Pattern()>>> createRules() const; |
|||
|
|||
/// Expression equivalence class representatives - we only store one item of an equivalence.
|
|||
std::vector<Expression> m_representatives; |
|||
std::vector<std::shared_ptr<AssemblyItem>> m_spareAssemblyItem; |
|||
}; |
|||
|
|||
/**
|
|||
* Pattern to match against an expression. |
|||
* Also stores matched expressions to retrieve them later, for constructing new expressions using |
|||
* ExpressionTemplate. |
|||
*/ |
|||
class Pattern |
|||
{ |
|||
public: |
|||
using Expression = ExpressionClasses::Expression; |
|||
using Id = ExpressionClasses::Id; |
|||
|
|||
// Matches a specific constant value.
|
|||
Pattern(unsigned _value): Pattern(u256(_value)) {} |
|||
// Matches a specific constant value.
|
|||
Pattern(u256 const& _value): m_type(Push), m_requireDataMatch(true), m_data(_value) {} |
|||
// Matches a specific assembly item type or anything if not given.
|
|||
Pattern(AssemblyItemType _type = UndefinedItem): m_type(_type) {} |
|||
// Matches a given instruction with given arguments
|
|||
Pattern(Instruction _instruction, std::vector<Pattern> const& _arguments = {}); |
|||
/// Sets this pattern to be part of the match group with the identifier @a _group.
|
|||
/// Inside one rule, all patterns in the same match group have to match expressions from the
|
|||
/// same expression equivalence class.
|
|||
void setMatchGroup(unsigned _group, std::map<unsigned, Expression const*>& _matchGroups); |
|||
unsigned matchGroup() const { return m_matchGroup; } |
|||
bool matches(Expression const& _expr, ExpressionClasses const& _classes) const; |
|||
|
|||
AssemblyItem toAssemblyItem() const { return AssemblyItem(m_type, m_data); } |
|||
std::vector<Pattern> arguments() const { return m_arguments; } |
|||
|
|||
/// @returns the id of the matched expression if this pattern is part of a match group.
|
|||
Id id() const { return matchGroupValue().id; } |
|||
/// @returns the data of the matched expression if this pattern is part of a match group.
|
|||
u256 d() const { return matchGroupValue().item->data(); } |
|||
|
|||
std::string toString() const; |
|||
|
|||
private: |
|||
bool matchesBaseItem(AssemblyItem const& _item) const; |
|||
Expression const& matchGroupValue() const; |
|||
|
|||
AssemblyItemType m_type; |
|||
bool m_requireDataMatch = false; |
|||
u256 m_data = 0; |
|||
std::vector<Pattern> m_arguments; |
|||
unsigned m_matchGroup = 0; |
|||
std::map<unsigned, Expression const*>* m_matchGroups = nullptr; |
|||
}; |
|||
|
|||
/**
|
|||
* Template for a new expression that can be built from matched patterns. |
|||
*/ |
|||
struct ExpressionTemplate |
|||
{ |
|||
using Expression = ExpressionClasses::Expression; |
|||
using Id = ExpressionClasses::Id; |
|||
explicit ExpressionTemplate(Pattern const& _pattern); |
|||
std::string toString() const; |
|||
bool hasId = false; |
|||
/// Id of the matched expression, if available.
|
|||
Id id = Id(-1); |
|||
// Otherwise, assembly item.
|
|||
AssemblyItem item = UndefinedItem; |
|||
std::vector<ExpressionTemplate> arguments; |
|||
}; |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,118 @@ |
|||
// CodeMirror, copyright (c) by Marijn Haverbeke and others
|
|||
// Distributed under an MIT license: http://codemirror.net/LICENSE
|
|||
|
|||
// Because sometimes you need to mark the selected *text*.
|
|||
//
|
|||
// Adds an option 'styleSelectedText' which, when enabled, gives
|
|||
// selected text the CSS class given as option value, or
|
|||
// "CodeMirror-selectedtext" when the value is not a string.
|
|||
|
|||
(function(mod) { |
|||
if (typeof exports == "object" && typeof module == "object") // CommonJS
|
|||
mod(require("../../lib/codemirror")); |
|||
else if (typeof define == "function" && define.amd) // AMD
|
|||
define(["../../lib/codemirror"], mod); |
|||
else // Plain browser env
|
|||
mod(CodeMirror); |
|||
})(function(CodeMirror) { |
|||
"use strict"; |
|||
|
|||
CodeMirror.defineOption("styleSelectedText", false, function(cm, val, old) { |
|||
var prev = old && old != CodeMirror.Init; |
|||
if (val && !prev) { |
|||
cm.state.markedSelection = []; |
|||
cm.state.markedSelectionStyle = typeof val == "string" ? val : "CodeMirror-selectedtext"; |
|||
reset(cm); |
|||
cm.on("cursorActivity", onCursorActivity); |
|||
cm.on("change", onChange); |
|||
} else if (!val && prev) { |
|||
cm.off("cursorActivity", onCursorActivity); |
|||
cm.off("change", onChange); |
|||
clear(cm); |
|||
cm.state.markedSelection = cm.state.markedSelectionStyle = null; |
|||
} |
|||
}); |
|||
|
|||
function onCursorActivity(cm) { |
|||
cm.operation(function() { update(cm); }); |
|||
} |
|||
|
|||
function onChange(cm) { |
|||
if (cm.state.markedSelection.length) |
|||
cm.operation(function() { clear(cm); }); |
|||
} |
|||
|
|||
var CHUNK_SIZE = 8; |
|||
var Pos = CodeMirror.Pos; |
|||
var cmp = CodeMirror.cmpPos; |
|||
|
|||
function coverRange(cm, from, to, addAt) { |
|||
if (cmp(from, to) == 0) return; |
|||
var array = cm.state.markedSelection; |
|||
var cls = cm.state.markedSelectionStyle; |
|||
for (var line = from.line;;) { |
|||
var start = line == from.line ? from : Pos(line, 0); |
|||
var endLine = line + CHUNK_SIZE, atEnd = endLine >= to.line; |
|||
var end = atEnd ? to : Pos(endLine, 0); |
|||
var mark = cm.markText(start, end, {className: cls}); |
|||
if (addAt == null) array.push(mark); |
|||
else array.splice(addAt++, 0, mark); |
|||
if (atEnd) break; |
|||
line = endLine; |
|||
} |
|||
} |
|||
|
|||
function clear(cm) { |
|||
var array = cm.state.markedSelection; |
|||
for (var i = 0; i < array.length; ++i) array[i].clear(); |
|||
array.length = 0; |
|||
} |
|||
|
|||
function reset(cm) { |
|||
clear(cm); |
|||
var ranges = cm.listSelections(); |
|||
for (var i = 0; i < ranges.length; i++) |
|||
coverRange(cm, ranges[i].from(), ranges[i].to()); |
|||
} |
|||
|
|||
function update(cm) { |
|||
if (!cm.somethingSelected()) return clear(cm); |
|||
if (cm.listSelections().length > 1) return reset(cm); |
|||
|
|||
var from = cm.getCursor("start"), to = cm.getCursor("end"); |
|||
|
|||
var array = cm.state.markedSelection; |
|||
if (!array.length) return coverRange(cm, from, to); |
|||
|
|||
var coverStart = array[0].find(), coverEnd = array[array.length - 1].find(); |
|||
if (!coverStart || !coverEnd || to.line - from.line < CHUNK_SIZE || |
|||
cmp(from, coverEnd.to) >= 0 || cmp(to, coverStart.from) <= 0) |
|||
return reset(cm); |
|||
|
|||
while (cmp(from, coverStart.from) > 0) { |
|||
array.shift().clear(); |
|||
coverStart = array[0].find(); |
|||
} |
|||
if (cmp(from, coverStart.from) < 0) { |
|||
if (coverStart.to.line - from.line < CHUNK_SIZE) { |
|||
array.shift().clear(); |
|||
coverRange(cm, from, coverStart.to, 0); |
|||
} else { |
|||
coverRange(cm, from, coverStart.from, 0); |
|||
} |
|||
} |
|||
|
|||
while (cmp(to, coverEnd.to) < 0) { |
|||
array.pop().clear(); |
|||
coverEnd = array[array.length - 1].find(); |
|||
} |
|||
if (cmp(to, coverEnd.to) > 0) { |
|||
if (to.line - coverEnd.from.line < CHUNK_SIZE) { |
|||
array.pop().clear(); |
|||
coverRange(cm, coverEnd.from, to); |
|||
} else { |
|||
coverRange(cm, coverEnd.to, to); |
|||
} |
|||
} |
|||
} |
|||
}); |
|||
@ -0,0 +1,202 @@ |
|||
/*
|
|||
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 ClientBase.cpp
|
|||
* @author Marek Kotewicz <marek@ethdev.com> |
|||
* @date 2015 |
|||
*/ |
|||
|
|||
#include <boost/test/unit_test.hpp> |
|||
#include <libdevcore/CommonJS.h> |
|||
#include "TestUtils.h" |
|||
|
|||
using namespace std; |
|||
using namespace dev; |
|||
using namespace dev::eth; |
|||
using namespace dev::test; |
|||
|
|||
BOOST_FIXTURE_TEST_SUITE(ClientBase, ParallelClientBaseFixture) |
|||
|
|||
BOOST_AUTO_TEST_CASE(blocks) |
|||
{ |
|||
enumerateClients([](Json::Value const& _json, dev::eth::ClientBase& _client) -> void |
|||
{ |
|||
for (string const& name: _json["postState"].getMemberNames()) |
|||
{ |
|||
Json::Value o = _json["postState"][name]; |
|||
Address address(name); |
|||
|
|||
// balanceAt
|
|||
u256 expectedBalance = u256(o["balance"].asString()); |
|||
u256 balance = _client.balanceAt(address); |
|||
ETH_CHECK_EQUAL(expectedBalance, balance); |
|||
|
|||
// countAt
|
|||
u256 expectedCount = u256(o["nonce"].asString()); |
|||
u256 count = _client.countAt(address); |
|||
ETH_CHECK_EQUAL(expectedCount, count); |
|||
|
|||
// stateAt
|
|||
for (string const& pos: o["storage"].getMemberNames()) |
|||
{ |
|||
u256 expectedState = u256(o["storage"][pos].asString()); |
|||
u256 state = _client.stateAt(address, u256(pos)); |
|||
ETH_CHECK_EQUAL(expectedState, state); |
|||
} |
|||
|
|||
// codeAt
|
|||
bytes expectedCode = fromHex(o["code"].asString()); |
|||
bytes code = _client.codeAt(address); |
|||
ETH_CHECK_EQUAL_COLLECTIONS(expectedCode.begin(), expectedCode.end(), |
|||
code.begin(), code.end()); |
|||
} |
|||
|
|||
// number
|
|||
unsigned expectedNumber = _json["blocks"].size(); |
|||
unsigned number = _client.number(); |
|||
ETH_CHECK_EQUAL(expectedNumber, number); |
|||
|
|||
u256 totalDifficulty = u256(_json["genesisBlockHeader"]["difficulty"].asString()); |
|||
for (Json::Value const& block: _json["blocks"]) |
|||
{ |
|||
Json::Value blockHeader = block["blockHeader"]; |
|||
Json::Value uncles = block["uncleHeaders"]; |
|||
Json::Value transactions = block["transactions"]; |
|||
h256 blockHash = h256(fromHex(blockHeader["hash"].asString())); |
|||
|
|||
// just update the difficulty
|
|||
for (Json::Value const& uncle: uncles) |
|||
{ |
|||
totalDifficulty += u256(uncle["difficulty"].asString()); |
|||
} |
|||
|
|||
// hashFromNumber
|
|||
h256 expectedHashFromNumber = h256(fromHex(blockHeader["hash"].asString())); |
|||
h256 hashFromNumber = _client.hashFromNumber(jsToInt(blockHeader["number"].asString())); |
|||
ETH_CHECK_EQUAL(expectedHashFromNumber, hashFromNumber); |
|||
|
|||
// blockInfo
|
|||
auto compareBlockInfos = [](Json::Value const& _b, BlockInfo _blockInfo) -> void |
|||
{ |
|||
LogBloom expectedBlockInfoBloom = LogBloom(fromHex(_b["bloom"].asString())); |
|||
Address expectedBlockInfoCoinbase = Address(fromHex(_b["coinbase"].asString())); |
|||
u256 expectedBlockInfoDifficulty = u256(_b["difficulty"].asString()); |
|||
bytes expectedBlockInfoExtraData = fromHex(_b["extraData"].asString()); |
|||
u256 expectedBlockInfoGasLimit = u256(_b["gasLimit"].asString()); |
|||
u256 expectedBlockInfoGasUsed = u256(_b["gasUsed"].asString()); |
|||
h256 expectedBlockInfoHash = h256(fromHex(_b["hash"].asString())); |
|||
h256 expectedBlockInfoMixHash = h256(fromHex(_b["mixHash"].asString())); |
|||
Nonce expectedBlockInfoNonce = Nonce(fromHex(_b["nonce"].asString())); |
|||
u256 expectedBlockInfoNumber = u256(_b["number"].asString()); |
|||
h256 expectedBlockInfoParentHash = h256(fromHex(_b["parentHash"].asString())); |
|||
h256 expectedBlockInfoReceiptsRoot = h256(fromHex(_b["receiptTrie"].asString())); |
|||
u256 expectedBlockInfoTimestamp = u256(_b["timestamp"].asString()); |
|||
h256 expectedBlockInfoTransactionsRoot = h256(fromHex(_b["transactionsTrie"].asString())); |
|||
h256 expectedBlockInfoUncldeHash = h256(fromHex(_b["uncleHash"].asString())); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoBloom, _blockInfo.logBloom); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoCoinbase, _blockInfo.coinbaseAddress); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoDifficulty, _blockInfo.difficulty); |
|||
ETH_CHECK_EQUAL_COLLECTIONS(expectedBlockInfoExtraData.begin(), expectedBlockInfoExtraData.end(), |
|||
_blockInfo.extraData.begin(), _blockInfo.extraData.end()); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoGasLimit, _blockInfo.gasLimit); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoGasUsed, _blockInfo.gasUsed); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoHash, _blockInfo.hash); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoMixHash, _blockInfo.mixHash); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoNonce, _blockInfo.nonce); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoNumber, _blockInfo.number); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoParentHash, _blockInfo.parentHash); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoReceiptsRoot, _blockInfo.receiptsRoot); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoTimestamp, _blockInfo.timestamp); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoTransactionsRoot, _blockInfo.transactionsRoot); |
|||
ETH_CHECK_EQUAL(expectedBlockInfoUncldeHash, _blockInfo.sha3Uncles); |
|||
}; |
|||
|
|||
BlockInfo blockInfo = _client.blockInfo(blockHash); |
|||
compareBlockInfos(blockHeader, blockInfo); |
|||
|
|||
// blockDetails
|
|||
unsigned expectedBlockDetailsNumber = jsToInt(blockHeader["number"].asString()); |
|||
totalDifficulty += u256(blockHeader["difficulty"].asString()); |
|||
BlockDetails blockDetails = _client.blockDetails(blockHash); |
|||
ETH_CHECK_EQUAL(expectedBlockDetailsNumber, blockDetails.number); |
|||
ETH_CHECK_EQUAL(totalDifficulty, blockDetails.totalDifficulty); |
|||
|
|||
auto compareTransactions = [](Json::Value const& _t, Transaction _transaction) -> void |
|||
{ |
|||
bytes expectedTransactionData = fromHex(_t["data"].asString()); |
|||
u256 expectedTransactionGasLimit = u256(_t["gasLimit"].asString()); |
|||
u256 expectedTransactionGasPrice = u256(_t["gasPrice"].asString()); |
|||
u256 expectedTransactionNonce = u256(_t["nonce"].asString()); |
|||
u256 expectedTransactionSignatureR = h256(fromHex(_t["r"].asString())); |
|||
u256 expectedTransactionSignatureS = h256(fromHex(_t["s"].asString())); |
|||
// unsigned expectedTransactionSignatureV = jsToInt(t["v"].asString());
|
|||
|
|||
ETH_CHECK_EQUAL_COLLECTIONS(expectedTransactionData.begin(), expectedTransactionData.end(), |
|||
_transaction.data().begin(), _transaction.data().end()); |
|||
ETH_CHECK_EQUAL(expectedTransactionGasLimit, _transaction.gas()); |
|||
ETH_CHECK_EQUAL(expectedTransactionGasPrice, _transaction.gasPrice()); |
|||
ETH_CHECK_EQUAL(expectedTransactionNonce, _transaction.nonce()); |
|||
ETH_CHECK_EQUAL(expectedTransactionSignatureR, _transaction.signature().r); |
|||
ETH_CHECK_EQUAL(expectedTransactionSignatureS, _transaction.signature().s); |
|||
// ETH_CHECK_EQUAL(expectedTransactionSignatureV, _transaction.signature().v); // 27 === 0x0, 28 === 0x1, not sure why
|
|||
}; |
|||
|
|||
Transactions ts = _client.transactions(blockHash); |
|||
TransactionHashes tHashes = _client.transactionHashes(blockHash); |
|||
unsigned tsCount = _client.transactionCount(blockHash); |
|||
|
|||
ETH_REQUIRE(transactions.size() == ts.size()); |
|||
ETH_REQUIRE(transactions.size() == tHashes.size()); |
|||
|
|||
// transactionCount
|
|||
ETH_CHECK_EQUAL(transactions.size(), tsCount); |
|||
|
|||
for (unsigned i = 0; i < tsCount; i++) |
|||
{ |
|||
Json::Value t = transactions[i]; |
|||
|
|||
// transaction (by block hash and transaction index)
|
|||
Transaction transaction = _client.transaction(blockHash, i); |
|||
compareTransactions(t, transaction); |
|||
|
|||
// transaction (by hash)
|
|||
Transaction transactionByHash = _client.transaction(transaction.sha3()); |
|||
compareTransactions(t, transactionByHash); |
|||
|
|||
// transactions
|
|||
compareTransactions(t, ts[i]); |
|||
|
|||
// transactionHashes
|
|||
ETH_CHECK_EQUAL(transaction.sha3(), tHashes[i]); |
|||
} |
|||
|
|||
// uncleCount
|
|||
unsigned usCount = _client.uncleCount(blockHash); |
|||
ETH_CHECK_EQUAL(uncles.size(), usCount); |
|||
|
|||
for (unsigned i = 0; i < usCount; i++) |
|||
{ |
|||
Json::Value u = uncles[i]; |
|||
|
|||
// uncle (by hash)
|
|||
BlockInfo uncle = _client.uncle(blockHash, i); |
|||
compareBlockInfos(u, uncle); |
|||
} |
|||
} |
|||
}); |
|||
} |
|||
|
|||
BOOST_AUTO_TEST_SUITE_END() |
|||
@ -0,0 +1,117 @@ |
|||
/*
|
|||
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 TestUtils.cpp
|
|||
* @author Marek Kotewicz <marek@ethdev.com> |
|||
* @date 2015 |
|||
*/ |
|||
|
|||
#include <thread> |
|||
#include <boost/test/unit_test.hpp> |
|||
#include <boost/filesystem.hpp> |
|||
#include <libtestutils/BlockChainLoader.h> |
|||
#include <libtestutils/FixedClient.h> |
|||
#include "TestUtils.h" |
|||
|
|||
using namespace std; |
|||
using namespace dev; |
|||
using namespace dev::eth; |
|||
using namespace dev::test; |
|||
|
|||
namespace dev |
|||
{ |
|||
namespace test |
|||
{ |
|||
|
|||
bool getCommandLineOption(std::string const& _name); |
|||
std::string getCommandLineArgument(std::string const& _name, bool _require = false); |
|||
|
|||
} |
|||
} |
|||
|
|||
bool dev::test::getCommandLineOption(string const& _name) |
|||
{ |
|||
auto argc = boost::unit_test::framework::master_test_suite().argc; |
|||
auto argv = boost::unit_test::framework::master_test_suite().argv; |
|||
bool result = false; |
|||
for (auto i = 0; !result && i < argc; ++i) |
|||
result = _name == argv[i]; |
|||
return result; |
|||
} |
|||
|
|||
std::string dev::test::getCommandLineArgument(string const& _name, bool _require) |
|||
{ |
|||
auto argc = boost::unit_test::framework::master_test_suite().argc; |
|||
auto argv = boost::unit_test::framework::master_test_suite().argv; |
|||
for (auto i = 1; i < argc; ++i) |
|||
{ |
|||
string str = argv[i]; |
|||
if (_name == str.substr(0, _name.size())) |
|||
return str.substr(str.find("=") + 1); |
|||
} |
|||
if (_require) |
|||
BOOST_ERROR("Failed getting command line argument: " << _name << " from: " << argv); |
|||
return ""; |
|||
} |
|||
|
|||
LoadTestFileFixture::LoadTestFileFixture() |
|||
{ |
|||
m_json = loadJsonFromFile(toTestFilePath(getCommandLineArgument("--eth_testfile"))); |
|||
} |
|||
|
|||
void ParallelFixture::enumerateThreads(std::function<void()> callback) const |
|||
{ |
|||
size_t threadsCount = std::stoul(getCommandLineArgument("--eth_threads"), nullptr, 10); |
|||
|
|||
vector<thread> workers; |
|||
for (size_t i = 0; i < threadsCount; i++) |
|||
workers.emplace_back(callback); |
|||
|
|||
for_each(workers.begin(), workers.end(), [](thread &t) |
|||
{ |
|||
t.join(); |
|||
}); |
|||
} |
|||
|
|||
void BlockChainFixture::enumerateBlockchains(std::function<void(Json::Value const&, dev::eth::BlockChain const&, State state)> callback) const |
|||
{ |
|||
for (string const& name: m_json.getMemberNames()) |
|||
{ |
|||
BlockChainLoader bcl(m_json[name]); |
|||
callback(m_json[name], bcl.bc(), bcl.state()); |
|||
} |
|||
} |
|||
|
|||
void ClientBaseFixture::enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) const |
|||
{ |
|||
enumerateBlockchains([&callback](Json::Value const& _json, BlockChain const& _bc, State _state) -> void |
|||
{ |
|||
FixedClient client(_bc, _state); |
|||
callback(_json, client); |
|||
}); |
|||
} |
|||
|
|||
void ParallelClientBaseFixture::enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) const |
|||
{ |
|||
ClientBaseFixture::enumerateClients([this, &callback](Json::Value const& _json, dev::eth::ClientBase& _client) -> void |
|||
{ |
|||
// json is being copied here
|
|||
enumerateThreads([callback, _json, &_client]() -> void |
|||
{ |
|||
callback(_json, _client); |
|||
}); |
|||
}); |
|||
} |
|||
@ -0,0 +1,82 @@ |
|||
/*
|
|||
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 TestUtils.h
|
|||
* @author Marek Kotewicz <marek@ethdev.com> |
|||
* @date 2015 |
|||
*/ |
|||
|
|||
#pragma once |
|||
|
|||
#include <functional> |
|||
#include <string> |
|||
#include <json/json.h> |
|||
#include <libethereum/BlockChain.h> |
|||
#include <libethereum/ClientBase.h> |
|||
|
|||
namespace dev |
|||
{ |
|||
namespace test |
|||
{ |
|||
|
|||
// should be used for multithread tests
|
|||
static SharedMutex x_boostTest; |
|||
#define ETH_CHECK_EQUAL(x, y) { dev::WriteGuard(x_boostTest); BOOST_CHECK_EQUAL(x, y); } |
|||
#define ETH_CHECK_EQUAL_COLLECTIONS(xb, xe, yb, ye) { dev::WriteGuard(x_boostTest); BOOST_CHECK_EQUAL_COLLECTIONS(xb, xe, yb, ye); } |
|||
#define ETH_REQUIRE(x) { dev::WriteGuard(x_boostTest); BOOST_REQUIRE(x); } |
|||
|
|||
struct LoadTestFileFixture |
|||
{ |
|||
LoadTestFileFixture(); |
|||
|
|||
protected: |
|||
Json::Value m_json; |
|||
}; |
|||
|
|||
struct ParallelFixture |
|||
{ |
|||
void enumerateThreads(std::function<void()> callback) const; |
|||
}; |
|||
|
|||
struct BlockChainFixture: public LoadTestFileFixture |
|||
{ |
|||
void enumerateBlockchains(std::function<void(Json::Value const&, dev::eth::BlockChain const&, dev::eth::State state)> callback) const; |
|||
}; |
|||
|
|||
struct ClientBaseFixture: public BlockChainFixture |
|||
{ |
|||
void enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) const; |
|||
}; |
|||
|
|||
// important BOOST TEST do have problems with thread safety!!!
|
|||
// BOOST_CHECK is not thread safe
|
|||
// BOOST_MESSAGE is not thread safe
|
|||
// http://boost.2283326.n4.nabble.com/Is-boost-test-thread-safe-td3471644.html
|
|||
// http://lists.boost.org/boost-users/2010/03/57691.php
|
|||
// worth reading
|
|||
// https://codecrafter.wordpress.com/2012/11/01/c-unit-test-framework-adapter-part-3/
|
|||
struct ParallelClientBaseFixture: public ClientBaseFixture, public ParallelFixture |
|||
{ |
|||
void enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) const; |
|||
}; |
|||
|
|||
struct JsonRpcFixture: public ClientBaseFixture |
|||
{ |
|||
|
|||
}; |
|||
|
|||
} |
|||
} |
|||
Loading…
Reference in new issue