Paweł Bylica
8 years ago
committed by
GitHub
GitHub
7 changed files with 18 additions and 305 deletions
@ -1,26 +1,9 @@ |
|||
cmake_policy(SET CMP0015 NEW) |
|||
|
|||
aux_source_directory(. SOURCES) |
|||
|
|||
include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS}) |
|||
include_directories(BEFORE ..) |
|||
|
|||
set(EXECUTABLE devcore) |
|||
|
|||
file(GLOB SOURCES "*.cpp") |
|||
file(GLOB HEADERS "*.h") |
|||
|
|||
add_library(devcore ${SOURCES} ${HEADERS}) |
|||
|
|||
target_link_libraries(devcore PUBLIC ${JSONCPP_LIBRARIES} Boost::boost) |
|||
|
|||
if (APPLE) |
|||
find_package(Threads REQUIRED) |
|||
target_link_libraries(${EXECUTABLE} PRIVATE ${CMAKE_THREAD_LIBS_INIT}) |
|||
elseif (UNIX) |
|||
find_package(Threads REQUIRED) |
|||
target_link_libraries(${EXECUTABLE} PRIVATE ${CMAKE_THREAD_LIBS_INIT}) |
|||
endif() |
|||
|
|||
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) |
|||
install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) |
|||
find_package(Threads) |
|||
|
|||
add_library(devcore ${SOURCES} ${HEADERS}) |
|||
target_link_libraries(devcore PUBLIC Boost::boost) |
|||
target_link_libraries(devcore PRIVATE ${CMAKE_THREAD_LIBS_INIT}) |
|||
#target_include_directories(devcore PRIVATE ..) |
|||
@ -1,103 +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 CommonJS.cpp
|
|||
* @authors: |
|||
* Gav Wood <i@gavwood.com> |
|||
* Marek Kotewicz <marek@ethdev.com> |
|||
* @date 2014 |
|||
*/ |
|||
|
|||
#include "CommonJS.h" |
|||
|
|||
using namespace std; |
|||
|
|||
namespace dev |
|||
{ |
|||
|
|||
bytes jsToBytes(string const& _s) |
|||
{ |
|||
if (_s.substr(0, 2) == "0x") |
|||
// Hex
|
|||
return fromHex(_s.substr(2)); |
|||
else if (_s.find_first_not_of("0123456789") == string::npos) |
|||
// Decimal
|
|||
return toCompactBigEndian(bigint(_s)); |
|||
else |
|||
return bytes(); |
|||
} |
|||
|
|||
bytes padded(bytes _b, unsigned _l) |
|||
{ |
|||
while (_b.size() < _l) |
|||
_b.insert(_b.begin(), 0); |
|||
return asBytes(asString(_b).substr(_b.size() - max(_l, _l))); |
|||
} |
|||
|
|||
bytes paddedRight(bytes _b, unsigned _l) |
|||
{ |
|||
_b.resize(_l); |
|||
return _b; |
|||
} |
|||
|
|||
bytes unpadded(bytes _b) |
|||
{ |
|||
auto p = asString(_b).find_last_not_of((char)0); |
|||
_b.resize(p == string::npos ? 0 : (p + 1)); |
|||
return _b; |
|||
} |
|||
|
|||
bytes unpadLeft(bytes _b) |
|||
{ |
|||
unsigned int i = 0; |
|||
if (_b.size() == 0) |
|||
return _b; |
|||
|
|||
while (i < _b.size() && _b[i] == byte(0)) |
|||
i++; |
|||
|
|||
if (i != 0) |
|||
_b.erase(_b.begin(), _b.begin() + i); |
|||
return _b; |
|||
} |
|||
|
|||
string fromRaw(h256 _n, unsigned* _inc) |
|||
{ |
|||
if (_n) |
|||
{ |
|||
string s((char const*)_n.data(), 32); |
|||
auto l = s.find_first_of('\0'); |
|||
if (!l) |
|||
return ""; |
|||
if (l != string::npos) |
|||
{ |
|||
auto p = s.find_first_not_of('\0', l); |
|||
if (!(p == string::npos || (_inc && p == 31))) |
|||
return ""; |
|||
if (_inc) |
|||
*_inc = (byte)s[31]; |
|||
s.resize(l); |
|||
} |
|||
for (auto i: s) |
|||
if (i < 32) |
|||
return ""; |
|||
return s; |
|||
} |
|||
return ""; |
|||
} |
|||
|
|||
} |
|||
|
|||
@ -1,123 +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 CommonJS.h
|
|||
* @authors: |
|||
* Gav Wood <i@gavwood.com> |
|||
* Marek Kotewicz <marek@ethdev.com> |
|||
* @date 2014 |
|||
*/ |
|||
|
|||
#pragma once |
|||
|
|||
#include <string> |
|||
#include "FixedHash.h" |
|||
#include "CommonData.h" |
|||
|
|||
namespace dev |
|||
{ |
|||
|
|||
template <unsigned S> std::string toJS(FixedHash<S> const& _h) |
|||
{ |
|||
return "0x" + toHex(_h.ref()); |
|||
} |
|||
|
|||
template <unsigned N> std::string toJS(boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N, N, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>> const& _n) |
|||
{ |
|||
std::string h = toHex(toCompactBigEndian(_n, 1)); |
|||
// remove first 0, if it is necessary;
|
|||
std::string res = h[0] != '0' ? h : h.substr(1); |
|||
return "0x" + res; |
|||
} |
|||
|
|||
inline std::string toJS(bytes const& _n, std::size_t _padding = 0) |
|||
{ |
|||
bytes n = _n; |
|||
n.resize(std::max<unsigned>(n.size(), _padding)); |
|||
return "0x" + toHex(n); |
|||
} |
|||
|
|||
template<unsigned T> std::string toJS(SecureFixedHash<T> const& _i) |
|||
{ |
|||
std::stringstream stream; |
|||
stream << "0x" << _i.makeInsecure().hex(); |
|||
return stream.str(); |
|||
} |
|||
|
|||
template<typename T> std::string toJS(T const& _i) |
|||
{ |
|||
std::stringstream stream; |
|||
stream << "0x" << std::hex << _i; |
|||
return stream.str(); |
|||
} |
|||
|
|||
/// Convert string to byte array. Input parameters can be hex or dec. Returns empty array if invalid input e.g neither dec or hex.
|
|||
bytes jsToBytes(std::string const& _s); |
|||
/// Add '0' on, or remove items from, the front of @a _b until it is of length @a _l.
|
|||
bytes padded(bytes _b, unsigned _l); |
|||
/// Add '0' on, or remove items from, the back of @a _b until it is of length @a _l.
|
|||
bytes paddedRight(bytes _b, unsigned _l); |
|||
/// Removing all trailing '0'. Returns empty array if input contains only '0' char.
|
|||
bytes unpadded(bytes _s); |
|||
/// Remove all 0 byte on the head of @a _s.
|
|||
bytes unpadLeft(bytes _s); |
|||
/// Convert h256 into user-readable string (by directly using std::string constructor).
|
|||
std::string fromRaw(h256 _n, unsigned* _inc = nullptr); |
|||
|
|||
template <unsigned N> FixedHash<N> jsToFixed(std::string const& _s) |
|||
{ |
|||
if (_s.substr(0, 2) == "0x") |
|||
// Hex
|
|||
return FixedHash<N>(_s.substr(2 + std::max<unsigned>(N * 2, _s.size() - 2) - N * 2)); |
|||
else if (_s.find_first_not_of("0123456789") == std::string::npos) |
|||
// Decimal
|
|||
return (typename FixedHash<N>::Arith)(_s); |
|||
else |
|||
// Binary
|
|||
return FixedHash<N>(); // FAIL
|
|||
} |
|||
|
|||
inline std::string jsToFixed(double _s) |
|||
{ |
|||
return toJS(u256(_s * (double)(u256(1) << 128))); |
|||
} |
|||
|
|||
template <unsigned N> boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>> jsToInt(std::string const& _s) |
|||
{ |
|||
if (_s.substr(0, 2) == "0x") |
|||
// Hex
|
|||
return fromBigEndian<boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>>(fromHex(_s.substr(2))); |
|||
else if (_s.find_first_not_of("0123456789") == std::string::npos) |
|||
// Decimal
|
|||
return boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>(_s); |
|||
else |
|||
// Binary
|
|||
return 0; // FAIL
|
|||
} |
|||
|
|||
inline u256 jsToU256(std::string const& _s) { return jsToInt<32>(_s); } |
|||
|
|||
inline int jsToInt(std::string const& _s) |
|||
{ |
|||
return std::stoi(_s, nullptr, 0); |
|||
} |
|||
|
|||
inline std::string jsToDecimal(std::string const& _s) |
|||
{ |
|||
return toString(jsToU256(_s)); |
|||
} |
|||
|
|||
} |
|||
Loading…
Reference in new issue