Add EVMJIT.

.gitignore

@@ -1,70 +1 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-
-# VS stuff
-build
-ipch
-*.sdf
-*.opensdf
-*.suo
-*.vcxproj
-*.vcxproj.filters
-*.sln
-
-# VIM stuff
-*.swp
-
-# Xcode stuff
-build_xc
-
-*.user
-*.user.*
-*~
-
-# build system
-build.*/
-extdep/install
-
-*.pyc
-
-
-# MacOS Development
-.DS_Store
-# CocoaPods
-Pods/
-Podfile.lock
-# Xcode
-.DS_Store
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-*.xcworkspace
-!default.xcworkspace
-xcuserdata
-*.xcuserstate
-profile
-*.moved-aside
-DerivedData
-project.pbxproj
-
-
-doc/html
-*.autosave
-node_modules/
+/build/

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "evmjit"]
-	path = evmjit
-	url = https://github.com/ethereum/evmjit
-	branch = develop

BuildInfo.h.in

@@ -1,7 +0,0 @@
-#pragma once
-
-#define ETH_COMMIT_HASH @ETH_COMMIT_HASH@
-#define ETH_CLEAN_REPO @ETH_CLEAN_REPO@
-#define ETH_BUILD_TYPE @ETH_BUILD_TYPE@
-#define ETH_BUILD_PLATFORM @ETH_BUILD_PLATFORM@ 
-

CMakeLists.txt

@@ -1,223 +1,44 @@
-# cmake global
 cmake_minimum_required(VERSION 2.8.12)
-# let cmake autolink dependencies on windows
-# it's specified globally, cause qt libraries requires that on windows and they are also found globally
-cmake_policy(SET CMP0020 NEW)
 
-project(ethereum)
+project(evmjit)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set(CMAKE_AUTOMOC OFF)
 
-
-######################################################################################################
-
-# user defined, defaults
-# Normally, set(...CACHE...) creates cache variables, but does not modify them.
-function(createDefaultCacheConfig)
-	set(HEADLESS OFF CACHE BOOL "Do not compile GUI (AlethZero)")
-	set(VMTRACE OFF CACHE BOOL "VM tracing and run-time checks (useful for cross-implementation VM debugging)")
-	set(PARANOIA OFF CACHE BOOL "Additional run-time checks")
-	set(JSONRPC ON CACHE BOOL "Build with jsonprc. default on")
-	set(EVMJIT OFF CACHE BOOL "Build a just-in-time compiler for EVM code (requires LLVM)")
-endfunction()
-
-
-# propagates CMake configuration options to the compiler
-function(configureProject)
-	if (PARANOIA)
-		if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-			add_definitions(-DETH_PARANOIA)
-		else ()
-			message(FATAL_ERROR "Paranoia requires debug.")
-		endif ()
-	endif ()
-
-	if (VMTRACE)
-		if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-			add_definitions(-DETH_VMTRACE)
-		else ()
-			message(FATAL_ERROR "VM tracing requires debug.")
-		endif ()
-	endif ()
-
-	if (EVMJIT)
-		add_definitions(-DETH_EVMJIT)
-	endif()
-
-	if (HEADLESS)
-		add_definitions(-DETH_HEADLESS)
-	endif()
-endfunction()
-
-
-
-function(createBuildInfo)
-	# Set build platform; to be written to BuildInfo.h
-	set(ETH_BUILD_PLATFORM "${TARGET_PLATFORM}")
-	if (CMAKE_COMPILER_IS_MINGW)
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/mingw")
-	elseif (CMAKE_COMPILER_IS_MSYS)
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/msys")
-	elseif (CMAKE_COMPILER_IS_GNUCXX)
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/g++")
-	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/msvc")
-	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/clang")
-	else ()
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/unknown")
-	endif ()
-
-	if (EVMJIT)
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/JIT")
-	else ()
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/int")
-	endif ()
-
-	if (PARANOIA)
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/PARA")
-	endif ()
-
-	#cmake build type may be not specified when using msvc
-	if (CMAKE_BUILD_TYPE)
-		set(_cmake_build_type ${CMAKE_BUILD_TYPE})
-	else()
-		set(_cmake_build_type "${CMAKE_CFG_INTDIR}")
-	endif()
-
-	# Generate header file containing useful build information
-	add_custom_target(BuildInfo.h ALL
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		COMMAND ${CMAKE_COMMAND} -DETH_SOURCE_DIR="${CMAKE_SOURCE_DIR}" -DETH_DST_DIR="${CMAKE_BINARY_DIR}"
-			-DETH_BUILD_TYPE="${_cmake_build_type}" -DETH_BUILD_PLATFORM="${ETH_BUILD_PLATFORM}" 
-			-P "${ETH_SCRIPTS_DIR}/buildinfo.cmake"
-		)
-	include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-	set(CMAKE_INCLUDE_CURRENT_DIR ON)
-	set(SRC_LIST BuildInfo.h)
-endfunction()
-
-
-
-######################################################################################################
-
-
-set(CMAKE_AUTOMOC ON)
-cmake_policy(SET CMP0015 NEW)
-
-
-createDefaultCacheConfig()
-configureProject()
-message(STATUS "CMAKE_VERSION: ${CMAKE_VERSION}")
-message("-- VMTRACE: ${VMTRACE}; PARANOIA: ${PARANOIA}; HEADLESS: ${HEADLESS}; JSONRPC: ${JSONRPC}; EVMJIT: ${EVMJIT}")
-
-
-# Default TARGET_PLATFORM to "linux".
-set(TARGET_PLATFORM CACHE STRING "linux")
-if ("x${TARGET_PLATFORM}" STREQUAL "x")
-	set(TARGET_PLATFORM "linux")
-endif ()
-
-if ("${TARGET_PLATFORM}" STREQUAL "linux")
-	set(CMAKE_THREAD_LIBS_INIT pthread)
-endif ()
-
-include(EthCompilerSettings)
-message("-- CXXFLAGS: ${CMAKE_CXX_FLAGS}")
-
-
-# this must be an include, as a function it would messs up with variable scope!
-include(EthDependencies)
-include(EthExecutableHelper)
-
-createBuildInfo()
-
-if (EVMJIT)
-	set(EVMJIT_CPP TRUE) # include CPP-JIT connector
-	add_subdirectory(evmjit)
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+else()
+	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wconversion -Wno-unknown-pragmas")
 endif()
 
-add_subdirectory(libdevcore)
-add_subdirectory(libevmcore)
-add_subdirectory(liblll)
-
-if (NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
-	add_subdirectory(libserpent)
-	add_subdirectory(sc)
-endif ()
-
-add_subdirectory(libsolidity)
-add_subdirectory(lllc)
-add_subdirectory(solc)
-
-if (JSONRPC)
-	add_subdirectory(libweb3jsonrpc)
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	# Do not allow unresovled symbols in shared library (default on linux)
+	set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
 endif()
 
-add_subdirectory(secp256k1)
-add_subdirectory(libp2p)
-add_subdirectory(libdevcrypto)
-add_subdirectory(libwhisper)
-
-add_subdirectory(libethcore)
-add_subdirectory(libevm)
-add_subdirectory(libethereum)
-
-add_subdirectory(libwebthree)
-add_subdirectory(test)
-add_subdirectory(eth)
-
-if("x${CMAKE_BUILD_TYPE}" STREQUAL "xDebug")
-	add_subdirectory(exp)
-endif ()
-
-# TODO check msvc
-if(NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
-	add_subdirectory(neth)
-endif ()
-
-if (NOT HEADLESS)
-	
-	add_subdirectory(libnatspec)
-	add_subdirectory(libjsqrc)
-	add_subdirectory(alethzero)
-	add_subdirectory(third)
-	add_subdirectory(mix)
-	
+# LLVM
+if(LLVM_DIR OR APPLE)	# local LLVM build
+	find_package(LLVM REQUIRED CONFIG)
+	message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+	message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+	add_definitions(${LLVM_DEFINITIONS})
+	# TODO: bitwriter is needed only for evmcc
+	llvm_map_components_to_libnames(LLVM_LIBS core support mcjit x86asmparser x86codegen bitwriter)
+else()
+	# Workaround for Ubuntu broken LLVM package
+	message(STATUS "Using llvm-3.5-dev package from Ubuntu. If does not work, build LLVM and set -DLLVM_DIR=llvm-build/share/llvm/cmake")
+	execute_process(COMMAND llvm-config-3.5 --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS)
+	message(STATUS "LLVM include dirs: ${LLVM_INCLUDE_DIRS}")
+	set(LLVM_LIBS "-lLLVMBitWriter -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMX86AsmParser -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMExecutionEngine -lLLVMMC -lLLVMCore -lLLVMSupport -lz -lpthread -lffi -ltinfo -ldl -lm")
+	add_definitions(-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS)
+	link_directories(/usr/lib/llvm-3.5/lib)
 endif()
 
-enable_testing()
-add_test(NAME alltests WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/test COMMAND testeth)
+add_subdirectory(libevmjit)
 
-#unset(TARGET_PLATFORM CACHE)
-
-if (WIN32)
-	# packaging stuff
-	include(InstallRequiredSystemLibraries)
-	set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ethereum")
-	set(CPACK_PACKAGE_VENDOR "ethereum.org")
-	set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-	set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-	set(CPACK_PACKAGE_VERSION "0.7")
-	set(CPACK_GENERATOR "NSIS")
-	# seems to be not working
-	# set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/alethzero/alethzero.bmp")
-
-	# our stuff
-	set(CPACK_COMPONENT_ALETHZERO_GROUP "Applications")
-	set(CPACK_COMPONENT_THIRD_GROUP "Applications")
-	set(CPACK_COMPONENT_MIX_GROUP "Applications")
-	set(CPACK_COMPONENTS_ALL alethzero third mix)
-
-	# nsis specific stuff
-	set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ethereum")
-	set(CPACK_NSIS_HELP_LINK "https://github.com/ethereum/cpp-ethereum")
-	set(CPACK_NSIS_URL_INFO_ABOUT "https://github.com/ethereum/cpp-ethereum")
-	set(CPACK_NSIS_CONTACT "ethereum.org")
-	set(CPACK_NSIS_MODIFY_PATH ON)
-	set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/alethzero/alethzero.ico")
-	set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/alethzero/alethzero.ico")
+if(EVMJIT_CPP)
+	add_subdirectory(libevmjit-cpp)
+endif()
 
-	include(CPack)
-endif (WIN32)
+if(EVMJIT_TOOLS)
+	add_subdirectory(evmcc)
+endif()

CodingStandards.txt

@@ -1,222 +0,0 @@
-0. Formatting
-
-GOLDEN RULE: Never *ever* use spaces for formatting.
-
-a. Use tabs for indentation!
-- tab stops are every 4 characters.
-- One indentation level -> exactly one byte (i.e. a tab character) in the source file.
-- Never use spaces to line up sequential lines: If you have run-on lines, indent as you would for a block.
-b. Line widths:
-- Don't worry about having lines of code > 80-char wide.
-- Lines of comments should be formatted according to ease of viewing, but simplicity is to be prefered over beauty.
-c. Don't use braces for condition-body one-liners.
-d. Never place condition bodies on same line as condition.
-e. Space between first paren and keyword, but *not* following first paren or preceeding final paren.
-f. No spaces when fewer than intra-expression three parens together; when three or more, space according to clarity.
-g. No spaces for subscripting.
-h. No space before ':' but one after it, except in the ternary operator: one on both sides.
-i. Space all other operators.
-j. Braces, when used, always have their own lines and are at same indentation level as "parent" scope.
-
-(WRONG)
-if( a==b[ i ] ) { printf ("Hello\n"); }
-foo->bar(someLongVariableName,
-         anotherLongVariableName,
-         anotherLongVariableName,
-         anotherLongVariableName,
-         anotherLongVariableName);
-
-(RIGHT)
-if (a == b[i])
-    printf("Hello\n");	// NOTE spaces used instead of tab here for clarity - first byte should be '\t'.
-foo->bar(
-    someLongVariableName,
-    anotherLongVariableName,
-    anotherLongVariableName,
-    anotherLongVariableName,
-    anotherLongVariableName
-);
-
-
-
-1. Namespaces;
-
-a. No "using namespace" declarations in header files.
-b. All symbols should be declared in a namespace except for final applications.
-c. Preprocessor symbols should be prefixed with the namespace in all-caps and an underscore.
-
-(WRONG)
-#include <cassert>
-using namespace std;
-tuple<float, float> meanAndSigma(vector<float> const& _v);
-
-(CORRECT)
-#include <cassert>
-std::tuple<float, float> meanAndSigma(std::vector<float> const& _v);
-
-
-
-2. Preprocessor;
-
-a. File comment is always at top, and includes:
-- Original author, date.
-- Later maintainers (not contributors - they can be seen through VCS log).
-- Copyright.
-- License (e.g. see COPYING).
-b. Never use #ifdef/#define/#endif file guards. Prefer #pragma once as first line below file comment.
-c. Prefer static const variable to value macros.
-d. Prefer inline constexpr functions to function macros.
-e. Split complex macro on multiple lines with '\'.
-
-
-
-3. Capitalization;
-
-GOLDEN RULE: Preprocessor: ALL_CAPS; C++: camelCase.
-
-a. Use camelCase for splitting words in names, except where obviously extending STL/boost functionality in which case follow those naming conventions.
-b. The following entities' first alpha is upper case:
-- Type names.
-- Template parameters.
-- Enum members.
-- static const variables that form an external API.
-c. All preprocessor symbols (macros, macro argments) in full uppercase with underscore word separation.
-
-
-All other entities' first alpha is lower case.
-
-
-
-4. Variable prefixes:
-
-a. Leading underscore "_" to parameter names (both normal and template).
-- Exception: "o_parameterName" when it is used exclusively for output. See 6(f).
-- Exception: "io_parameterName" when it is used for both input and output. See 6(f).
-b. Leading "c_" to const variables (unless part of an external API).
-c. Leading "g_" to global (non-const) variables.
-d. Leading "s_" to static (non-const, non-global) variables.
-
-
-
-5. Error reporting:
-
-- Prefer exception to bool/int return type.
-
-
-
-6. Declarations:
-
-a. {Typename} + {qualifiers} + {name}.
-b. Only one per line.
-c. Associate */& with type, not variable (at ends with parser, but more readable, and safe if in conjunction with (b)).
-d. Favour declarations close to use; don't habitually declare at top of scope ala C.
-e. Always pass non-trivial parameters with a const& suffix.
-f. If a function returns multiple values, use std::tuple (std::pair acceptable). Prefer not using */& arguments, except where efficiency requires.
-g. Never use a macro where adequate non-preprocessor C++ can be written.
-h. Prefer "using NewType = OldType" to "typedef OldType NewType".
-i. Make use of auto whenever type is clear or unimportant:
-- Always avoid doubly-stating the type.
-- Use to avoid vast and unimportant type declarations.
-
-
-(WRONG)
-const double d = 0;
-int i, j;
-char *s;
-float meanAndSigma(std::vector<float> _v, float* _sigma);
-Derived* x(dynamic_cast<Derived*>(base));
-for (map<ComplexTypeOne, ComplexTypeTwo>::iterator i = l.begin(); i != l.end(); ++l) {}
-
-(CORRECT)
-double const d = 0;
-int i;
-int j;
-char* s;
-std::tuple<float, float> meanAndSigma(std::vector<float> const& _v);
-auto x = dynamic_cast<Derived*>(base);
-for (auto i = x.begin(); i != x.end(); ++i) {}
-
-
-7. Structs & classes
-
-a. Structs to be used when all members public and no virtual functions.
-- In this case, members should be named naturally and not prefixed with 'm_'
-b. Classes to be used in all other circumstances.
-
-
-
-8. Members:
-
-a. One member per line only.
-b. Private, non-static, non-const fields prefixed with m_.
-c. Avoid public fields, except in structs.
-d. Use override, final and const as much as possible.
-e. No implementations with the class declaration, except:
-- template or force-inline method (though prefer implementation at bottom of header file).
-- one-line implementation (in which case include it in same line as declaration).
-f. For a property 'foo'
-- Member: m_foo;
-- Getter: foo() [ also: for booleans, isFoo() ];
-- Setter: setFoo();
-
-
-
-9. Naming
-
-a. Collection conventions:
-- -s means std::vector e.g. using MyTypes = std::vector<MyType>
-- -Set means std::set e.g. using MyTypeSet = std::set<MyType>
-- -Hash means std::unordered_set e.g. using MyTypeHash = std::unordered_set<MyType>
-b. Class conventions:
-- -Face means the interface of some shared concept. (e.g. FooFace might be a pure virtual class.)
-c. Avoid unpronouncable names;
-- If you need to shorten a name favour a pronouncable slice of the original to a scatterred set of consonants.
-- e.g. Manager shortens to Man rather than Mgr.
-d. Avoid prefixes of initials (e.g. DON'T use IMyInterface, CMyImplementation)
-e. Find short, memorable & (at least semi-) descriptive names for commonly used classes or name-fragments.
-- A dictionary and thesaurus are your friends.
-- Spell correctly.
-- Think carefully about the class's purpose.
-- Imagine it as an isolated component to try to decontextualise it when considering its name.
-- Don't be trapped into naming it (purely) in terms of its implementation.
-
-
-
-10. Type-definitions
-
-a. Prefer 'using' to 'typedef'. e.g. using ints = std::vector<int>; rather than typedef std::vector<int> ints;
-b. Generally avoid shortening a standard form that already includes all important information:
-- e.g. stick to shared_ptr<X> rather than shortening to ptr<X>.
-c. Where there are exceptions to this (due to excessive use and clear meaning), note the change prominently and use it consistently.
-- e.g. using Guard = boost::lock_guard<std::mutex>; ///< Guard is used throughout the codebase since it's clear in meaning and used commonly. 
-d. In general expressions should be roughly as important/semantically meaningful as the space they occupy.
-
-
-
-11. Commenting
-
-a. Comments should be doxygen-compilable, using @notation rather than \notation.
-b. Document the interface, not the implementation.
-- Documentation should be able to remain completely unchanged, even if the method is reimplemented.
-- Comment in terms of the method properties and intended alteration to class state (or what aspects of the state it reports).
-- Be careful to scrutinise documentation that extends only to intended purpose and usage.
-- Reject documentation that is simply an English transaction of the implementation.
-
-
-
-12. Include Headers
-
-a. Includes should go in order of lower level (STL -> boost -> libdevcore -> libdevcrypto -> libethcore -> libethereum) to higher level. Lower levels are basically dependencies to the higher levels. For example:
-
-#include <string>
-#include <boost/filesystem.hpp>
-
-#include <libdevcore/Common.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Exceptions.h>
-#include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
-#include <libethereum/Defaults.h>
-
-b. The only exception to the above rule is the top of a .cpp file where its corresponding header should be located.
-

EthereumMacOSXBundleInfo.plist.in

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
-	<key>CFBundleGetInfoString</key>
-	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
-	<key>CFBundleIconFile</key>
-	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
-	<key>CFBundleIdentifier</key>
-	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
-	<key>CFBundleName</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-	<key>NSHighResolutionCapable</key>
-	<true/>
-</dict>
-</plist>

LICENSE

@@ -1,673 +0,0 @@
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

secp256k1/COPYING → LICENSE.md

@@ -1,4 +1,6 @@
-Copyright (c) 2013 Pieter Wuille
+The MIT License (MIT)
+
+Copyright (c) 2015 Paweł Bylica <chfast@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,41 +1,43 @@
-## Ethereum C++ Client.
+# The Ethereum EVM JIT
 
-By Gav Wood et al, 2013, 2014, 2015.
+EVM JIT is a library for just-in-time compilation of Ethereum EVM code.
+It can be used to substitute classic interpreter-like EVM Virtual Machine in Ethereum client.
 
-          | Linux   | OSX | Windows
-----------|---------|-----|--------
-develop   | [![Build+Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20C%2B%2B%20develop%20branch)](http://build.ethdev.com/builders/Linux%20C%2B%2B%20develop%20branch/builds/-1) | [![Build+Status](http://build.ethdev.com/buildstatusimage?builder=OSX%20C%2B%2B%20develop%20branch)](http://build.ethdev.com/builders/OSX%20C%2B%2B%20develop%20branch/builds/-1) | [![Build+Status](http://build.ethdev.com/buildstatusimage?builder=Windows%20C%2B%2B%20develop%20branch)](http://build.ethdev.com/builders/Windows%20C%2B%2B%20develop%20branch/builds/-1)
-master    | [![Build+Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20C%2B%2B%20master%20branch)](http://build.ethdev.com/builders/Linux%20C%2B%2B%20master%20branch/builds/-1) | [![Build+Status](http://build.ethdev.com/buildstatusimage?builder=OSX%20C%2B%2B%20master%20branch)](http://build.ethdev.com/builders/OSX%20C%2B%2B%20master%20branch/builds/-1) | [![Build+Status](http://build.ethdev.com/buildstatusimage?builder=Windows%20C%2B%2B%20master%20branch)](http://build.ethdev.com/builders/Windows%20C%2B%2B%20master%20branch/builds/-1)
-evmjit    | [![Build+Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20C%2B%2B%20develop%20evmjit)](http://build.ethdev.com/builders/Linux%20C%2B%2B%20develop%20evmjit/builds/-1) | [![Build+Status](http://build.ethdev.com/buildstatusimage?builder=OSX%20C%2B%2B%20develop%20evmjit)](http://build.ethdev.com/builders/OSX%20C%2B%2B%20develop%20evmjit/builds/-1) | N/A
+## Build
 
-[![Stories in Ready](https://badge.waffle.io/ethereum/cpp-ethereum.png?label=ready&title=Ready)](http://waffle.io/ethereum/cpp-ethereum)
+### Linux / Ubuntu
 
-Ethereum is based on a design in an original whitepaper by Vitalik Buterin. This implementation is based on the formal specification of a refinement of that idea detailed in the 'yellow paper' by Gavin Wood. Contributors, builders and testers include Alex Leverington (Clang & Mac building, client multiplexing), Tim Hughes (MSVC compilation & Dagger testing), Caktux (ongoing CI), Christoph Jentzsch (tests), Christian Reissweiner (Solidity), Marek Kotewicz (external JS & JSON-RPC), Eric Lombrozo (MinGW32 cross-compilation), Marko Simovic (original CI), and several others.
+1. Install llvm-3.5-dev package
+  1. For Ubuntu 14.04 using LLVM deb packages source: http://llvm.org/apt
+  2. For Ubuntu 14.10 using Ubuntu packages
+2. Build library with cmake
+  1. `mkdir build && cd $_`
+  2. `cmake .. && make`
+3. Install library
+  1. `sudo make install`
+  2. `sudo ldconfig`
+  
+### OSX
 
-### Building
+1. Install llvm35
+  1. `brew install llvm35 --disable-shared --HEAD`
+2. Build library with cmake
+  1. `mkdir build && cd $_`
+  2. `cmake -DLLVM_DIR=/usr/local/lib/llvm-3.5/share/llvm/cmake .. && make`
+3. Install library
+  1. `make install` (with admin rights?)
+  
+### Windows
 
-See the [Wiki](https://github.com/ethereum/cpp-ethereum/wiki) for build instructions, compatibility information and build tips. 
+Ask me.
 
-### Testing
+## Options
 
-To run the tests, make sure you clone the tests repository from github.com/ethereum to tests as a sibling to cpp-ethereum.
+Options to evmjit library can be passed by environmental variables, e.g. `EVMJIT_CACHE=0 testeth --jit`.
 
-### Yet To Do
+Option        | Default value | Description
+------------- | ------------- | ----------------------------------------------
+EVMJIT_CACHE  | 1             | Enables on disk cache for compiled EVM objects
+EVMJIT_DUMP   | 0             | Dumps generated LLVM module to standard output
+  
 
-See [TODO](https://github.com/ethereum/cpp-ethereum/wiki/TODO)
-
-### License
-
-See [LICENSE](LICENSE)
-
-### Contributing
-
-All development goes in develop branch - please don't submit pull requests to master.
-
-Please read [CodingStandards.txt](CodingStandards.txt) thoroughly before making alterations to the code base. Please do *NOT* use an editor that automatically reformats whitespace away from astylerc or the formatting guidelines as described in [CodingStandards.txt](CodingStandards.txt).
-
-libweb3jsonrpc/abstractwebthreestubserver.h is autogenerated from the jsonrpcstub executable that comes with the libjsonrpc library (json-rpc-cpp project). It shouldn't be maually altered.
-
-```bash
-jsonrpcstub spec.json --cpp-server=AbstractWebThreeStubServer
-```

alethzero/CMakeLists.txt

@@ -1,62 +0,0 @@
-cmake_policy(SET CMP0015 NEW)
-# let cmake autolink dependencies on windows
-cmake_policy(SET CMP0020 NEW)
-# this policy was introduced in cmake 3.0
-# remove if, once 3.0 will be used on unix
-if (${CMAKE_MAJOR_VERSION} GREATER 2)
-	cmake_policy(SET CMP0043 OLD)
-endif()
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-aux_source_directory(. SRC_LIST)
-
-include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
-include_directories(BEFORE ..)
-include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
-
-qt5_wrap_ui(ui_Main.h Main.ui)
-qt5_wrap_ui(ui_Debugger.h Debugger.ui)
-qt5_wrap_ui(ui_Transact.h Transact.ui)
-
-file(GLOB HEADERS "*.h")
-
-if (APPLE)
-	set(EXECUTABLE AlethZero)
-else ()
-	set(EXECUTABLE alethzero)
-endif ()
-	
-# eth_add_executable is defined in cmake/EthExecutableHelper.cmake
-eth_add_executable(${EXECUTABLE} 
-	ICON alethzero 
-	UI_RESOURCES alethzero.icns Main.ui Debugger.ui Transact.ui
-	WIN_RESOURCES alethzero.rc
-)
-
-add_dependencies(${EXECUTABLE} BuildInfo.h)
-
-target_link_libraries(${EXECUTABLE} Qt5::Core)
-target_link_libraries(${EXECUTABLE} Qt5::Widgets)
-target_link_libraries(${EXECUTABLE} Qt5::WebKit)
-target_link_libraries(${EXECUTABLE} Qt5::WebKitWidgets)
-target_link_libraries(${EXECUTABLE} webthree)
-target_link_libraries(${EXECUTABLE} ethereum)
-target_link_libraries(${EXECUTABLE} evm)
-target_link_libraries(${EXECUTABLE} ethcore)
-target_link_libraries(${EXECUTABLE} devcrypto)
-target_link_libraries(${EXECUTABLE} secp256k1)
-target_link_libraries(${EXECUTABLE} lll)
-target_link_libraries(${EXECUTABLE} solidity)
-target_link_libraries(${EXECUTABLE} evmcore)
-target_link_libraries(${EXECUTABLE} devcore)
-target_link_libraries(${EXECUTABLE} web3jsonrpc)
-target_link_libraries(${EXECUTABLE} jsqrc)
-target_link_libraries(${EXECUTABLE} natspec)
-
-if (NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
-	target_link_libraries(${EXECUTABLE} serpent)
-endif()
-
-# eth_install_executable is defined in cmake/EthExecutableHelper.cmake
-eth_install_executable(${EXECUTABLE})
-

alethzero/Context.cpp

@@ -1,59 +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 Debugger.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2015
- */
-
-#include "Context.h"
-#include <QComboBox>
-#include <libethcore/CommonEth.h>
-using namespace std;
-using namespace dev;
-using namespace dev::eth;
-
-NatSpecFace::~NatSpecFace()
-{
-}
-
-Context::~Context()
-{
-}
-
-void initUnits(QComboBox* _b)
-{
-	for (auto n = (unsigned)units().size(); n-- != 0; )
-		_b->addItem(QString::fromStdString(units()[n].second), n);
-}
-
-vector<KeyPair> keysAsVector(QList<KeyPair> const& keys)
-{
-	auto list = keys.toStdList();
-	return {begin(list), end(list)};
-}
-
-bool sourceIsSolidity(string const& _source)
-{
-	// TODO: Improve this heuristic
-	return (_source.substr(0, 8) == "contract" || _source.substr(0, 5) == "//sol");
-}
-
-bool sourceIsSerpent(string const& _source)
-{
-	// TODO: Improve this heuristic
-	return (_source.substr(0, 5) == "//ser");
-}

alethzero/Context.h

@@ -1,68 +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 Debugger.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2015
- */
-
-#pragma once
-
-#include <string>
-#include <vector>
-#include <QString>
-#include <QList>
-#include <libethcore/CommonEth.h>
-
-class QComboBox;
-
-namespace dev { namespace eth { struct StateDiff; } }
-
-#define Small "font-size: small; "
-#define Mono "font-family: Ubuntu Mono, Monospace, Lucida Console, Courier New; font-weight: bold; "
-#define Div(S) "<div style=\"" S "\">"
-#define Span(S) "<span style=\"" S "\">"
-
-void initUnits(QComboBox* _b);
-
-std::vector<dev::KeyPair> keysAsVector(QList<dev::KeyPair> const& _keys);
-
-bool sourceIsSolidity(std::string const& _source);
-bool sourceIsSerpent(std::string const& _source);
-
-class NatSpecFace
-{
-public:
-	virtual ~NatSpecFace();
-
-	virtual void add(dev::h256 const& _contractHash, std::string const& _doc) = 0;
-	virtual std::string retrieve(dev::h256 const& _contractHash) const = 0;
-	virtual std::string getUserNotice(std::string const& json, const dev::bytes& _transactionData) = 0;
-	virtual std::string getUserNotice(dev::h256 const& _contractHash, dev::bytes const& _transactionDacta) = 0;
-};
-
-class Context
-{
-public:
-	virtual ~Context();
-
-	virtual QString pretty(dev::Address _a) const = 0;
-	virtual QString prettyU256(dev::u256 _n) const = 0;
-	virtual QString render(dev::Address _a) const = 0;
-	virtual dev::Address fromString(QString const& _a) const = 0;
-	virtual std::string renderDiff(dev::eth::StateDiff const& _d) const = 0;
-};
-

alethzero/Debugger.cpp

@@ -1,380 +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 Debugger.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2015
- */
-
-#include "Debugger.h"
-
-#include <fstream>
-#include <QFileDialog>
-#include <libevm/VM.h>
-#include <libethereum/ExtVM.h>
-#include <libethereum/Executive.h>
-#include "ui_Debugger.h"
-using namespace std;
-using namespace dev;
-using namespace dev::eth;
-
-Debugger::Debugger(Context* _c, QWidget* _parent):
-	QDialog(_parent),
-	ui(new Ui::Debugger),
-	m_context(_c)
-{
-	ui->setupUi(this);
-}
-
-Debugger::~Debugger()
-{
-	delete ui;
-}
-
-void Debugger::init()
-{
-	if (m_session.history.size())
-	{
-		alterDebugStateGroup(true);
-		ui->debugCode->setEnabled(false);
-		ui->debugTimeline->setMinimum(0);
-		ui->debugTimeline->setMaximum(m_session.history.size());
-		ui->debugTimeline->setValue(0);
-	}
-}
-
-void Debugger::populate(dev::eth::Executive& _executive, dev::eth::Transaction const& _transaction)
-{
-	finished();
-	if (m_session.populate(_executive, _transaction))
-		init();
-	update();
-}
-
-bool DebugSession::populate(dev::eth::Executive& _executive, dev::eth::Transaction const& _transaction)
-{
-	try {
-		if (_executive.setup(_transaction))
-			return false;
-	}
-	catch (...)
-	{
-		// Invalid transaction
-		return false;
-	}
-
-	vector<WorldState const*> levels;
-	bytes lastExtCode;
-	bytesConstRef lastData;
-	h256 lastHash;
-	h256 lastDataHash;
-	auto onOp = [&](uint64_t steps, Instruction inst, dev::bigint newMemSize, dev::bigint gasCost, VM* voidVM, ExtVMFace const* voidExt)
-	{
-		VM& vm = *voidVM;
-		ExtVM const& ext = *static_cast<ExtVM const*>(voidExt);
-		if (ext.code != lastExtCode)
-		{
-			lastExtCode = ext.code;
-			lastHash = sha3(lastExtCode);
-			if (!codes.count(lastHash))
-				codes[lastHash] = ext.code;
-		}
-		if (ext.data != lastData)
-		{
-			lastData = ext.data;
-			lastDataHash = sha3(lastData);
-			if (!codes.count(lastDataHash))
-				codes[lastDataHash] = ext.data.toBytes();
-		}
-		if (levels.size() < ext.depth)
-			levels.push_back(&history.back());
-		else
-			levels.resize(ext.depth);
-		history.append(WorldState({steps, ext.myAddress, vm.curPC(), inst, newMemSize, vm.gas(), lastHash, lastDataHash, vm.stack(), vm.memory(), gasCost, ext.state().storage(ext.myAddress), levels}));
-	};
-	_executive.go(onOp);
-	_executive.finalize();
-	return true;
-}
-
-void Debugger::finished()
-{
-	m_session = DebugSession();
-	ui->callStack->clear();
-	ui->debugCode->clear();
-	ui->debugStack->clear();
-	ui->debugMemory->setHtml("");
-	ui->debugStorage->setHtml("");
-	ui->debugStateInfo->setText("");
-	alterDebugStateGroup(false);
-}
-
-void Debugger::update()
-{
-	if (m_session.history.size())
-	{
-		WorldState const& nws = m_session.history[min((int)m_session.history.size() - 1, ui->debugTimeline->value())];
-		WorldState const& ws = ui->callStack->currentRow() > 0 ? *nws.levels[nws.levels.size() - ui->callStack->currentRow()] : nws;
-
-		if (ui->debugTimeline->value() >= m_session.history.size())
-		{
-			if (ws.gasCost > ws.gas)
-				ui->debugMemory->setHtml("<h3>OUT-OF-GAS</h3>");
-			else if (ws.inst == Instruction::RETURN && ws.stack.size() >= 2)
-			{
-				unsigned from = (unsigned)ws.stack.back();
-				unsigned size = (unsigned)ws.stack[ws.stack.size() - 2];
-				unsigned o = 0;
-				bytes out(size, 0);
-				for (; o < size && from + o < ws.memory.size(); ++o)
-					out[o] = ws.memory[from + o];
-				ui->debugMemory->setHtml("<h3>RETURN</h3>" + QString::fromStdString(dev::memDump(out, 16, true)));
-			}
-			else if (ws.inst == Instruction::STOP)
-				ui->debugMemory->setHtml("<h3>STOP</h3>");
-			else if (ws.inst == Instruction::SUICIDE && ws.stack.size() >= 1)
-				ui->debugMemory->setHtml("<h3>SUICIDE</h3>0x" + QString::fromStdString(toString(right160(ws.stack.back()))));
-			else
-				ui->debugMemory->setHtml("<h3>EXCEPTION</h3>");
-
-			ostringstream ss;
-			ss << dec << "EXIT  |  GAS: " << dec << max<dev::bigint>(0, (dev::bigint)ws.gas - ws.gasCost);
-			ui->debugStateInfo->setText(QString::fromStdString(ss.str()));
-			ui->debugStorage->setHtml("");
-			ui->debugCallData->setHtml("");
-			m_session.currentData = h256();
-			ui->callStack->clear();
-			m_session.currentLevels.clear();
-			ui->debugCode->clear();
-			m_session.currentCode = h256();
-			ui->debugStack->setHtml("");
-		}
-		else
-		{
-			if (m_session.currentLevels != nws.levels || !ui->callStack->count())
-			{
-				m_session.currentLevels = nws.levels;
-				ui->callStack->clear();
-				for (unsigned i = 0; i <= nws.levels.size(); ++i)
-				{
-					WorldState const& s = i ? *nws.levels[nws.levels.size() - i] : nws;
-					ostringstream out;
-					out << s.cur.abridged();
-					if (i)
-						out << " " << instructionInfo(s.inst).name << " @0x" << hex << s.curPC;
-					ui->callStack->addItem(QString::fromStdString(out.str()));
-				}
-			}
-
-			if (ws.code != m_session.currentCode)
-			{
-				m_session.currentCode = ws.code;
-				bytes const& code = m_session.codes[ws.code];
-				QListWidget* dc = ui->debugCode;
-				dc->clear();
-				m_session.pcWarp.clear();
-				for (unsigned i = 0; i <= code.size(); ++i)
-				{
-					byte b = i < code.size() ? code[i] : 0;
-					try
-					{
-						QString s = QString::fromStdString(instructionInfo((Instruction)b).name);
-						ostringstream out;
-						out << hex << setw(4) << setfill('0') << i;
-						m_session.pcWarp[i] = dc->count();
-						if (b >= (byte)Instruction::PUSH1 && b <= (byte)Instruction::PUSH32)
-						{
-							unsigned bc = b - (byte)Instruction::PUSH1 + 1;
-							s = "PUSH 0x" + QString::fromStdString(toHex(bytesConstRef(&code[i + 1], bc)));
-							i += bc;
-						}
-						dc->addItem(QString::fromStdString(out.str()) + "  "  + s);
-					}
-					catch (...)
-					{
-						cerr << "Unhandled exception!" << endl << boost::current_exception_diagnostic_information();
-						break;	// probably hit data segment
-					}
-				}
-			}
-
-			if (ws.callData != m_session.currentData)
-			{
-				m_session.currentData = ws.callData;
-				if (ws.callData)
-				{
-					assert(m_session.codes.count(ws.callData));
-					ui->debugCallData->setHtml(QString::fromStdString(dev::memDump(m_session.codes[ws.callData], 16, true)));
-				}
-				else
-					ui->debugCallData->setHtml("");
-			}
-
-			QString stack;
-			for (auto i: ws.stack)
-				stack.prepend("<div>" + m_context->prettyU256(i) + "</div>");
-			ui->debugStack->setHtml(stack);
-			ui->debugMemory->setHtml(QString::fromStdString(dev::memDump(ws.memory, 16, true)));
-			assert(m_session.codes.count(ws.code));
-
-			if (m_session.codes[ws.code].size() >= (unsigned)ws.curPC)
-			{
-				int l = m_session.pcWarp[(unsigned)ws.curPC];
-				ui->debugCode->setCurrentRow(max(0, l - 5));
-				ui->debugCode->setCurrentRow(min(ui->debugCode->count() - 1, l + 5));
-				ui->debugCode->setCurrentRow(l);
-			}
-			else
-				cwarn << "PC (" << (unsigned)ws.curPC << ") is after code range (" << m_session.codes[ws.code].size() << ")";
-
-			ostringstream ss;
-			ss << dec << "STEP: " << ws.steps << "  |  PC: 0x" << hex << ws.curPC << "  :  " << instructionInfo(ws.inst).name << "  |  ADDMEM: " << dec << ws.newMemSize << " words  |  COST: " << dec << ws.gasCost <<  "  |  GAS: " << dec << ws.gas;
-			ui->debugStateInfo->setText(QString::fromStdString(ss.str()));
-			stringstream s;
-			for (auto const& i: ws.storage)
-				s << "@" << m_context->prettyU256(i.first).toStdString() << "&nbsp;&nbsp;&nbsp;&nbsp;" << m_context->prettyU256(i.second).toStdString() << "<br/>";
-			ui->debugStorage->setHtml(QString::fromStdString(s.str()));
-		}
-	}
-}
-
-void Debugger::on_callStack_currentItemChanged()
-{
-	update();
-}
-
-void Debugger::alterDebugStateGroup(bool _enable) const
-{
-	ui->stepOver->setEnabled(_enable);
-	ui->stepInto->setEnabled(_enable);
-	ui->stepOut->setEnabled(_enable);
-	ui->backOver->setEnabled(_enable);
-	ui->backInto->setEnabled(_enable);
-	ui->backOut->setEnabled(_enable);
-	ui->dump->setEnabled(_enable);
-	ui->dumpStorage->setEnabled(_enable);
-	ui->dumpPretty->setEnabled(_enable);
-}
-
-void Debugger::on_debugTimeline_valueChanged()
-{
-	update();
-}
-
-void Debugger::on_stepOver_clicked()
-{
-	if (ui->debugTimeline->value() < m_session.history.size()) {
-		auto l = m_session.history[ui->debugTimeline->value()].levels.size();
-		if ((ui->debugTimeline->value() + 1) < m_session.history.size() && m_session.history[ui->debugTimeline->value() + 1].levels.size() > l)
-		{
-			on_stepInto_clicked();
-			if (m_session.history[ui->debugTimeline->value()].levels.size() > l)
-				on_stepOut_clicked();
-		}
-		else
-			on_stepInto_clicked();
-	}
-}
-
-void Debugger::on_stepInto_clicked()
-{
-	ui->debugTimeline->setValue(ui->debugTimeline->value() + 1);
-	ui->callStack->setCurrentRow(0);
-}
-
-void Debugger::on_stepOut_clicked()
-{
-	if (ui->debugTimeline->value() < m_session.history.size())
-	{
-		auto ls = m_session.history[ui->debugTimeline->value()].levels.size();
-		auto l = ui->debugTimeline->value();
-		for (; l < m_session.history.size() && m_session.history[l].levels.size() >= ls; ++l) {}
-		ui->debugTimeline->setValue(l);
-		ui->callStack->setCurrentRow(0);
-	}
-}
-
-void Debugger::on_backInto_clicked()
-{
-	ui->debugTimeline->setValue(ui->debugTimeline->value() - 1);
-	ui->callStack->setCurrentRow(0);
-}
-
-void Debugger::on_backOver_clicked()
-{
-	auto l = m_session.history[ui->debugTimeline->value()].levels.size();
-	if (ui->debugTimeline->value() > 0 && m_session.history[ui->debugTimeline->value() - 1].levels.size() > l)
-	{
-		on_backInto_clicked();
-		if (m_session.history[ui->debugTimeline->value()].levels.size() > l)
-			on_backOut_clicked();
-	}
-	else
-		on_backInto_clicked();
-}
-
-void Debugger::on_backOut_clicked()
-{
-	if (ui->debugTimeline->value() > 0 && m_session.history.size() > 0)
-	{
-		auto ls = m_session.history[min(ui->debugTimeline->value(), m_session.history.size() - 1)].levels.size();
-		int l = ui->debugTimeline->value();
-		for (; l > 0 && m_session.history[l].levels.size() >= ls; --l) {}
-		ui->debugTimeline->setValue(l);
-		ui->callStack->setCurrentRow(0);
-	}
-}
-
-void Debugger::on_dump_clicked()
-{
-	QString fn = QFileDialog::getSaveFileName(this, "Select file to output EVM trace");
-	ofstream f(fn.toStdString());
-	if (f.is_open())
-		for (WorldState const& ws: m_session.history)
-			f << ws.cur << " " << hex << toHex(dev::toCompactBigEndian(ws.curPC, 1)) << " " << hex << toHex(dev::toCompactBigEndian((int)(byte)ws.inst, 1)) << " " << hex << toHex(dev::toCompactBigEndian((uint64_t)ws.gas, 1)) << endl;
-}
-
-void Debugger::on_dumpPretty_clicked()
-{
-	QString fn = QFileDialog::getSaveFileName(this, "Select file to output EVM trace");
-	ofstream f(fn.toStdString());
-	if (f.is_open())
-		for (WorldState const& ws: m_session.history)
-		{
-			f << endl << "    STACK" << endl;
-			for (auto i: ws.stack)
-				f << (h256)i << endl;
-			f << "    MEMORY" << endl << dev::memDump(ws.memory);
-			f << "    STORAGE" << endl;
-			for (auto const& i: ws.storage)
-				f << showbase << hex << i.first << ": " << i.second << endl;
-			f << dec << ws.levels.size() << " | " << ws.cur << " | #" << ws.steps << " | " << hex << setw(4) << setfill('0') << ws.curPC << " : " << instructionInfo(ws.inst).name << " | " << dec << ws.gas << " | -" << dec << ws.gasCost << " | " << ws.newMemSize << "x32";
-		}
-}
-
-void Debugger::on_dumpStorage_clicked()
-{
-	QString fn = QFileDialog::getSaveFileName(this, "Select file to output EVM trace");
-	ofstream f(fn.toStdString());
-	if (f.is_open())
-		for (WorldState const& ws: m_session.history)
-		{
-			if (ws.inst == Instruction::STOP || ws.inst == Instruction::RETURN || ws.inst == Instruction::SUICIDE)
-				for (auto i: ws.storage)
-					f << toHex(dev::toCompactBigEndian(i.first, 1)) << " " << toHex(dev::toCompactBigEndian(i.second, 1)) << endl;
-			f << ws.cur << " " << hex << toHex(dev::toCompactBigEndian(ws.curPC, 1)) << " " << hex << toHex(dev::toCompactBigEndian((int)(byte)ws.inst, 1)) << " " << hex << toHex(dev::toCompactBigEndian((uint64_t)ws.gas, 1)) << endl;
-		}
-}

alethzero/Debugger.h

@@ -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 Debugger.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2015
- */
-
-#pragma once
-
-#include <libdevcore/RLP.h>
-#include <libethcore/CommonEth.h>
-#include <libethereum/State.h>
-#include <libethereum/Executive.h>
-#include <QDialog>
-#include <QMap>
-#include <QList>
-#include "Context.h"
-
-namespace Ui { class Debugger; }
-
-struct WorldState
-{
-	uint64_t steps;
-	dev::Address cur;
-	dev::u256 curPC;
-	dev::eth::Instruction inst;
-	dev::bigint newMemSize;
-	dev::u256 gas;
-	dev::h256 code;
-	dev::h256 callData;
-	dev::u256s stack;
-	dev::bytes memory;
-	dev::bigint gasCost;
-	std::map<dev::u256, dev::u256> storage;
-	std::vector<WorldState const*> levels;
-};
-
-struct DebugSession
-{
-	DebugSession() {}
-
-	bool populate(dev::eth::Executive& _executive, dev::eth::Transaction const& _transaction);
-
-	dev::h256 currentCode;
-	dev::h256 currentData;
-	std::vector<WorldState const*> currentLevels;
-
-	QMap<unsigned, unsigned> pcWarp;
-	QList<WorldState> history;
-
-	std::map<dev::u256, dev::bytes> codes;
-};
-
-class Debugger: public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit Debugger(Context* _context, QWidget* _parent = 0);
-	~Debugger();
-
-	void populate(dev::eth::Executive& _executive, dev::eth::Transaction const& _transaction);
-
-protected slots:
-	void on_callStack_currentItemChanged();
-	void on_debugTimeline_valueChanged();
-	void on_stepOver_clicked();
-	void on_stepInto_clicked();
-	void on_stepOut_clicked();
-	void on_backOver_clicked();
-	void on_backInto_clicked();
-	void on_backOut_clicked();
-	void on_dump_clicked();
-	void on_dumpPretty_clicked();
-	void on_dumpStorage_clicked();
-	void on_close_clicked() { close(); }
-
-private:
-	void init();
-	void update();
-	void finished();
-
-	void alterDebugStateGroup(bool _enable) const;
-
-	Ui::Debugger* ui;
-
-	DebugSession m_session;
-	Context* m_context;
-};

alethzero/Debugger.ui

@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Debugger</class>
- <widget class="QDialog" name="Debugger">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>989</width>
-    <height>690</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QFrame" name="frame">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QToolButton" name="stepOver">
-        <property name="text">
-         <string>Step Over</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="stepInto">
-        <property name="text">
-         <string>Step Into</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="stepOut">
-        <property name="text">
-         <string>Step Out</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="backOver">
-        <property name="text">
-         <string>Back Over</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="backInto">
-        <property name="text">
-         <string>Back Into</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="backOut">
-        <property name="text">
-         <string>Back Out</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QSplitter" name="splitter_6">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QSplitter" name="splitter_42">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-        <horstretch>1</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <widget class="QListWidget" name="debugCode">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-       <property name="lineWidth">
-        <number>0</number>
-       </property>
-      </widget>
-      <widget class="QListWidget" name="callStack">
-       <property name="font">
-        <font>
-         <family>Ubuntu Mono</family>
-        </font>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-       <property name="lineWidth">
-        <number>0</number>
-       </property>
-      </widget>
-     </widget>
-     <widget class="QSplitter" name="splitter_4">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-        <horstretch>1</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <widget class="QTextEdit" name="debugStack">
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-       <property name="lineWidth">
-        <number>0</number>
-       </property>
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-       <property name="textInteractionFlags">
-        <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-       </property>
-      </widget>
-      <widget class="QTextEdit" name="debugMemory">
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-       <property name="lineWidth">
-        <number>0</number>
-       </property>
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-       <property name="textInteractionFlags">
-        <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-       </property>
-      </widget>
-      <widget class="QTextEdit" name="debugStorage">
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-       <property name="lineWidth">
-        <number>0</number>
-       </property>
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-       <property name="textInteractionFlags">
-        <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-       </property>
-      </widget>
-      <widget class="QTextEdit" name="debugCallData">
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="debugStateInfo">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QSlider" name="debugTimeline">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="frame_2">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QToolButton" name="dump">
-        <property name="text">
-         <string>Dump</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="dumpStorage">
-        <property name="text">
-         <string>Dump Storage</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="dumpPretty">
-        <property name="text">
-         <string>Dump Pretty</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>577</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QToolButton" name="close">
-        <property name="text">
-         <string>Close</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

alethzero/DownloadView.cpp

@@ -1,83 +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 DownloadView.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include "DownloadView.h"
-
-#include <QtWidgets>
-#include <QtCore>
-#include <libethereum/DownloadMan.h>
-#include "Grapher.h"
-
-using namespace std;
-using namespace dev;
-using namespace dev::eth;
-
-DownloadView::DownloadView(QWidget* _p): QWidget(_p)
-{
-}
-
-void DownloadView::paintEvent(QPaintEvent*)
-{
-	QPainter p(this);
-
-	p.fillRect(rect(), Qt::white);
-	if (!m_man || m_man->chain().empty() || !m_man->subCount())
-		return;
-
-	double ratio = (double)rect().width() / rect().height();
-	if (ratio < 1)
-		ratio = 1 / ratio;
-	double n = min(16.0, min(rect().width(), rect().height()) / ceil(sqrt(m_man->chain().size() / ratio)));
-
-//	QSizeF area(rect().width() / floor(rect().width() / n), rect().height() / floor(rect().height() / n));
-	QSizeF area(n, n);
-	QPointF pos(0, 0);
-
-	auto bg = m_man->blocksGot();
-
-	for (unsigned i = bg.all().first, ei = bg.all().second; i < ei; ++i)
-	{
-		int s = -2;
-		if (bg.contains(i))
-			s = -1;
-		else
-		{
-			unsigned h = 0;
-			m_man->foreachSub([&](DownloadSub const& sub)
-			{
-				if (sub.askedContains(i))
-					s = h;
-				h++;
-			});
-		}
-		unsigned dh = 360 / m_man->subCount();
-		if (s == -2)
-			p.fillRect(QRectF(QPointF(pos) + QPointF(3 * area.width() / 8, 3 * area.height() / 8), area / 4), Qt::black);
-		else if (s == -1)
-			p.fillRect(QRectF(QPointF(pos) + QPointF(1 * area.width() / 8, 1 * area.height() / 8), area * 3 / 4), Qt::black);
-		else
-			p.fillRect(QRectF(QPointF(pos) + QPointF(1 * area.width() / 8, 1 * area.height() / 8), area * 3 / 4), QColor::fromHsv(s * dh, 64, 128));
-
-		pos.setX(pos.x() + n);
-		if (pos.x() >= rect().width() - n)
-			pos = QPoint(0, pos.y() + n);
-	}
-}

alethzero/DownloadView.h

@@ -1,53 +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 DownloadView.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#pragma once
-
-#ifdef Q_MOC_RUN
-#define BOOST_MPL_IF_HPP_INCLUDED
-#endif
-
-#include <list>
-#include <QtWidgets/QWidget>
-#ifndef Q_MOC_RUN
-#include <libethereum/Client.h>
-#endif
-
-namespace dev { namespace eth {
-struct MineInfo;
-class DownloadMan;
-}}
-
-class DownloadView: public QWidget
-{
-	Q_OBJECT
-
-public:
-	DownloadView(QWidget* _p = nullptr);
-
-	void setDownloadMan(dev::eth::DownloadMan const* _man) { m_man = _man; }
-
-protected:
-	virtual void paintEvent(QPaintEvent*);
-
-private:
-	dev::eth::DownloadMan const* m_man = nullptr;
-};

alethzero/GraphParameters.h

@@ -1,106 +0,0 @@
-/* BEGIN COPYRIGHT
- *
- * This file is part of Noted.
- *
- * Copyright ©2011, 2012, Lancaster Logic Response Limited.
- *
- * Noted 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 2 of the License, or
- * (at your option) any later version.
- *
- * Noted 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 Noted.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <algorithm>
-#include <type_traits>
-#include <cmath>
-
-#undef foreach
-#define foreach BOOST_FOREACH
-
-namespace lb
-{
-
-template <class T>
-static T graphParameters(T _min, T _max, unsigned _divisions, T* o_from = 0, T* o_delta = 0, bool _forceMinor = false, T _divisor = 1)
-{
-	T uMin = _min / _divisor;
-	T uMax = _max / _divisor;
-	if (uMax == uMin || !_divisions)
-	{
-		if (o_delta && o_from)
-		{
-			*o_from = 0;
-			*o_delta = 1;
-		}
-		return 1;
-	}
-	long double l10 = std::log10((uMax - uMin) / T(_divisions) * 5.5f);
-	long double mt = std::pow(10.f, l10 - std::floor(l10));
-	long double ep = std::pow(10.f, std::floor(l10));
-	T inc = _forceMinor
-			? ((mt > 6.f) ? ep / 2.f : (mt > 3.f) ? ep / 5.f : (mt > 1.2f) ? ep / 10.f : ep / 20.f)
-			: ((mt > 6.f) ? ep * 2.f : (mt > 3.f) ? ep : (mt > 1.2f) ? ep / 2.f : ep / 5.f);
-	if (inc == 0)
-		inc = 1;
-	if (o_delta && o_from)
-	{
-		(*o_from) = std::floor(uMin / inc) * inc * _divisor;
-		(*o_delta) = (std::ceil(uMax / inc) - std::floor(uMin / inc)) * inc * _divisor;
-	}
-	else if (o_from)
-	{
-		(*o_from) = std::ceil(uMin / inc) * inc * _divisor;
-	}
-	return inc * _divisor;
-}
-
-struct GraphParametersForceMinor { GraphParametersForceMinor() {} };
-static const GraphParametersForceMinor ForceMinor;
-
-template <class T>
-struct GraphParameters
-{
-	inline GraphParameters(std::pair<T, T> _range, unsigned _divisions)
-	{
-		incr = graphParameters(_range.first, _range.second, _divisions, &from, &delta, false);
-		to = from + delta;
-	}
-
-	inline GraphParameters(std::pair<T, T> _range, unsigned _divisions, GraphParametersForceMinor)
-	{
-		incr = graphParameters(_range.first, _range.second, _divisions, &from, &delta, true);
-		to = from + delta;
-	}
-
-	inline GraphParameters(std::pair<T, T> _range, unsigned _divisions, T _divisor)
-	{
-		major = graphParameters(_range.first, _range.second, _divisions, &from, &delta, false, _divisor);
-		incr = graphParameters(_range.first, _range.second, _divisions, &from, &delta, true, _divisor);
-		to = from + delta;
-	}
-
-	template <class S, class Enable = void>
-	struct MajorDeterminor { static bool go(S _s, S _j) { S ip; S fp = std::modf(_s / _j + S(0.5), &ip); return fabs(fabs(fp) - 0.5) < 0.05; } };
-	template <class S>
-	struct MajorDeterminor<S, typename std::enable_if<std::is_integral<S>::value>::type> { static S go(S _s, S _j) { return _s % _j == 0; } };
-
-	bool isMajor(T _t) const { return MajorDeterminor<T>::go(_t, major); }
-
-	T from;
-	T delta;
-	T major;
-	T to;
-	T incr;
-};
-
-}

alethzero/Grapher.cpp

@@ -1,195 +0,0 @@
-/* BEGIN COPYRIGHT
- *
- * This file is part of Noted.
- *
- * Copyright ©2011, 2012, Lancaster Logic Response Limited.
- *
- * Noted 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 2 of the License, or
- * (at your option) any later version.
- *
- * Noted 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 Noted.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QtGui/QPainter>
-
-#include "GraphParameters.h"
-#include "Grapher.h"
-
-using namespace std;
-using namespace lb;
-
-void Grapher::init(QPainter* _p, std::pair<float, float> _xRange, std::pair<float, float> _yRange, std::function<std::string(float)> _xLabel, std::function<std::string(float)> _yLabel, std::function<std::string(float, float)> _pLabel, int _leftGutter, int _bottomGutter)
-{
-	fontPixelSize = QFontInfo(QFont("Ubuntu", 10)).pixelSize();
-
-	if (_leftGutter)
-		_leftGutter = max<int>(_leftGutter, fontPixelSize * 2);
-	if (_bottomGutter)
-		_bottomGutter = max<int>(_bottomGutter, fontPixelSize * 1.25);
-
-	QRect a(_leftGutter, 0, _p->viewport().width() - _leftGutter, _p->viewport().height() - _bottomGutter);
-	init(_p, _xRange, _yRange, _xLabel, _yLabel, _pLabel, a);
-}
-
-bool Grapher::drawAxes(bool _x, bool _y) const
-{
-	int w = active.width();
-	int h = active.height();
-	int l = active.left();
-	int r = active.right();
-	int t = active.top();
-	int b = active.bottom();
-
-	p->setFont(QFont("Ubuntu", 10));
-	p->fillRect(p->viewport(), qRgb(255, 255, 255));
-
-	static const int c_markLength = 2;
-	static const int c_markSpacing = 2;
-	static const int c_xSpacing = fontPixelSize * 3;
-	static const int c_ySpacing = fontPixelSize * 1.25;
-
-	if (w < c_xSpacing || h < c_ySpacing || !p->viewport().contains(active))
-		return false;
-
-	if (_y)
-	{
-		GraphParameters<float> yParams(yRange, h / c_ySpacing, 1.f);
-		float dy = fabs(yRange.second - yRange.first);
-		if (dy > .001)
-			for (float f = yParams.from; f < yParams.to; f += yParams.incr)
-			{
-				int y = b - h * (f - yParams.from) / dy;
-				if (yParams.isMajor(f))
-				{
-					p->setPen(QColor(208, 208, 208));
-					p->drawLine(l - c_markLength, y, r, y);
-					if (l > p->viewport().left())
-					{
-						p->setPen(QColor(144, 144, 144));
-						p->drawText(QRect(0, y - c_ySpacing / 2, l - c_markLength - c_markSpacing, c_ySpacing), Qt::AlignRight|Qt::AlignVCenter, QString::fromStdString(yLabel(round(f * 100000) / 100000)));
-					}
-				}
-				else
-				{
-					p->setPen(QColor(236, 236, 236));
-					p->drawLine(l, y, r, y);
-				}
-			}
-		p->setPen(QColor(192,192,192));
-		p->drawLine(l - c_markSpacing, b, r, b);
-	}
-
-	if (_x)
-	{
-		GraphParameters<float> xParams(xRange, w / c_xSpacing, 1.f);
-		float dx = fabs(xRange.second - xRange.first);
-		for (float f = xParams.from; f < xParams.to; f += xParams.incr)
-		{
-			int x = l + w * (f - xParams.from) / dx;
-			if (xParams.isMajor(f))
-			{
-				p->setPen(QColor(208, 208, 208));
-				p->drawLine(x, t, x, b + c_markLength);
-				if (b < p->viewport().bottom())
-				{
-					p->setPen(QColor(144, 144, 144));
-					p->drawText(QRect(x - c_xSpacing / 2, b + c_markLength + c_markSpacing, c_xSpacing, p->viewport().height() - (b + c_markLength + c_markSpacing)), Qt::AlignHCenter|Qt::AlignTop, QString::fromStdString(xLabel(f)));
-				}
-			}
-			else
-			{
-				p->setPen(QColor(236, 236, 236));
-				p->drawLine(x, t, x, b);
-			}
-		}
-	}
-
-	p->setClipRect(active);
-	return true;
-}
-
-void Grapher::drawLineGraph(vector<float> const& _data, QColor _color, QBrush const& _fillToZero, float _width) const
-{
-	int s = _data.size();
-	QPoint l;
-	for (int i = 0; i < s; ++i)
-	{
-		int zy = yP(0.f);
-		QPoint h(xTP(i), yTP(_data[i]));
-		if (i)
-		{
-			if (_fillToZero != Qt::NoBrush)
-			{
-				p->setPen(Qt::NoPen);
-				p->setBrush(_fillToZero);
-				p->drawPolygon(QPolygon(QVector<QPoint>() << QPoint(h.x(), zy) << h << l << QPoint(l.x(), zy)));
-			}
-			p->setPen(QPen(_color, _width));
-			p->drawLine(QLine(l, h));
-		}
-		l = h;
-	}
-}
-
-void Grapher::ruleY(float _x, QColor _color, float _width) const
-{
-	p->setPen(QPen(_color, _width));
-	p->drawLine(xTP(_x), active.top(), xTP(_x), active.bottom());
-}
-
-void Grapher::drawLineGraph(std::function<float(float)> const& _f, QColor _color, QBrush const& _fillToZero, float _width) const
-{
-	QPoint l;
-	for (int x = active.left(); x < active.right(); x += 2)
-	{
-		int zy = yP(0.f);
-		QPoint h(x, yTP(_f(xRU(x))));
-		if (x != active.left())
-		{
-			if (_fillToZero != Qt::NoBrush)
-			{
-				p->setPen(Qt::NoPen);
-				p->setBrush(_fillToZero);
-				p->drawPolygon(QPolygon(QVector<QPoint>() << QPoint(h.x(), zy) << h << l << QPoint(l.x(), zy)));
-			}
-			p->setPen(QPen(_color, _width));
-			p->drawLine(QLine(l, h));
-		}
-		l = h;
-	}
-}
-
-void Grapher::labelYOrderedPoints(map<float, float> const& _data, int _maxCount, float _minFactor) const
-{
-	int ly = active.top() + 6;
-	int pc = 0;
-	if (_data.empty())
-		return;
-	float smallestAllowed = prev(_data.end())->first * _minFactor;
-	for (auto peaki = _data.rbegin(); peaki != _data.rend(); ++peaki)
-		if ((peaki->first > smallestAllowed || _minFactor == 0) && pc < _maxCount)
-		{
-			auto peak = *peaki;
-			int x = xTP(peak.second);
-			int y = yTP(peak.first);
-			p->setPen(QColor::fromHsvF(float(pc) / _maxCount, 1.f, 0.5f, 0.5f));
-			p->drawEllipse(QPoint(x, y), 4, 4);
-			p->drawLine(x, y - 4, x, ly + 6);
-			QString f = QString::fromStdString(pLabel(xT(peak.second), yT(peak.first)));
-			int fw = p->fontMetrics().width(f);
-			p->drawLine(x + 16 + fw + 2, ly + 6, x, ly + 6);
-			p->setPen(QColor::fromHsvF(0, 0.f, .35f));
-			p->fillRect(QRect(x+12, ly-6, fw + 8, 12), QBrush(QColor(255, 255, 255, 160)));
-			p->drawText(QRect(x+16, ly-6, 160, 12), Qt::AlignVCenter, f);
-			ly += 14;
-			++pc;
-		}
-}

alethzero/Grapher.h

@@ -1,116 +0,0 @@
-/* BEGIN COPYRIGHT
- *
- * This file is part of Noted.
- *
- * Copyright ©2011, 2012, Lancaster Logic Response Limited.
- *
- * Noted 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 2 of the License, or
- * (at your option) any later version.
- *
- * Noted 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 Noted.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <map>
-#include <vector>
-#include <string>
-#include <utility>
-#include <functional>
-
-#include <QtGui/QBrush>
-#include <QtCore/QRect>
-
-class QPainter;
-
-namespace lb
-{
-
-class Grapher
-{
-public:
-	Grapher(): p(0) {}
-	void init(QPainter* _p, std::pair<float, float> _xRange, std::pair<float, float> _yRange, std::function<std::string(float _f)> _xLabel, std::function<std::string(float _f)> _yLabel, std::function<std::string(float, float)> _pLabel, int _leftGutter = 30, int _bottomGutter = 16);
-	void init(QPainter* _p, std::pair<float, float> _xRange, std::pair<float, float> _yRange, std::function<std::string(float _f)> _xLabel, std::function<std::string(float _f)> _yLabel, std::function<std::string(float, float)> _pLabel, QRect _active)
-	{
-		p = _p;
-		active = _active;
-		xRange = _xRange;
-		yRange = _yRange;
-		dx = xRange.second - xRange.first;
-		dy = yRange.second - yRange.first;
-		xLabel = _xLabel;
-		yLabel = _yLabel;
-		pLabel = _pLabel;
-	}
-
-	void setDataTransform(float _xM, float _xC, float _yM, float _yC)
-	{
-		xM = _xM;
-		xC = _xC;
-		yM = _yM;
-		yC = _yC;
-	}
-	void setDataTransform(float _xM, float _xC)
-	{
-		xM = _xM;
-		xC = _xC;
-		yM = 1.f;
-		yC = 0.f;
-	}
-	void resetDataTransform() { xM = yM = 1.f; xC = yC = 0.f; }
-
-	bool drawAxes(bool _x = true, bool _y = true) const;
-	void drawLineGraph(std::vector<float> const& _data, QColor _color = QColor(128, 128, 128), QBrush const& _fillToZero = Qt::NoBrush, float _width = 0.f) const;
-	void drawLineGraph(std::function<float(float)> const& _f, QColor _color = QColor(128, 128, 128), QBrush const& _fillToZero = Qt::NoBrush, float _width = 0.f) const;
-	void ruleX(float _y, QColor _color = QColor(128, 128, 128), float _width = 0.f) const;
-	void ruleY(float _x, QColor _color = QColor(128, 128, 128), float _width = 0.f) const;
-	void labelYOrderedPoints(std::map<float, float> const& _translatedData, int _maxCount = 20, float _minFactor = .01f) const;
-
-protected:
-	QPainter* p = nullptr;
-	QRect active;
-	std::pair<float, float> xRange;
-	std::pair<float, float> yRange;
-
-	float xM = 0;
-	float xC = 0;
-	float yM = 0;
-	float yC = 0;
-
-	float dx = 0;
-	float dy = 0;
-
-	std::function<std::string(float _f)> xLabel;
-	std::function<std::string(float _f)> yLabel;
-	std::function<std::string(float _x, float _y)> pLabel;
-
-	float fontPixelSize = 0;
-
-	// Translate from raw indexed data into x/y graph units. Only relevant for indexed data.
-	float xT(float _dataIndex) const { return _dataIndex * xM + xC; }
-	float yT(float _dataValue) const { return _dataValue * yM + yC; }
-	// Translate from x/y graph units to widget pixels.
-	int xP(float _xUnits) const { return active.left() + (_xUnits - xRange.first) / dx * active.width(); }
-	int yP(float _yUnits) const { return active.bottom() - (_yUnits - yRange.first) / dy * active.height(); }
-	QPoint P(float _x, float _y) const { return QPoint(xP(_x), yP(_y)); }
-	// Translate direcly from raw indexed data to widget pixels.
-	int xTP(float _dataIndex) const { return active.left() + (xT(_dataIndex) - xRange.first) / dx * active.width(); }
-	int yTP(float _dataValue) const { return active.bottom() - (yT(_dataValue) - yRange.first) / dy * active.height(); }
-	// Translate back from pixels into graph units.
-	float xU(int _xPixels) const { return float(_xPixels - active.left()) / active.width() * dx + xRange.first; }
-	// Translate back from graph units into raw data index.
-	float xR(float _xUnits) const { return (_xUnits - xC) / xM; }
-	// Translate directly from pixels into raw data index. xRU(xTP(X)) == X
-	float xRU(int _xPixels) const { return xR(xU(_xPixels)); }
-};
-
-}

alethzero/MainWin.h

@@ -1,248 +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 MainWin.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#pragma once
-
-#ifdef Q_MOC_RUN
-#define BOOST_MPL_IF_HPP_INCLUDED
-#endif
-
-#include <map>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QMutex>
-#include <QtWidgets/QMainWindow>
-#include <libdevcore/RLP.h>
-#include <libethcore/CommonEth.h>
-#include <libethereum/State.h>
-#include <libethereum/Executive.h>
-#include <libwebthree/WebThree.h>
-#include <libsolidity/CompilerStack.h>
-#include "Context.h"
-#include "Transact.h"
-#include "NatspecHandler.h"
-
-namespace Ui {
-class Main;
-}
-
-namespace dev { namespace eth {
-class Client;
-class State;
-}}
-
-namespace jsonrpc {
-class HttpServer;
-}
-
-class QQuickView;
-class OurWebThreeStubServer;
-
-using WatchHandler = std::function<void(dev::eth::LocalisedLogEntries const&)>;
-
-QString contentsOfQResource(std::string const& res);
-
-class Main: public QMainWindow, public Context
-{
-	Q_OBJECT
-
-public:
-	explicit Main(QWidget *parent = 0);
-	~Main();
-
-	dev::WebThreeDirect* web3() const { return m_webThree.get(); }
-	dev::eth::Client* ethereum() const { return m_webThree->ethereum(); }
-	std::shared_ptr<dev::shh::WhisperHost> whisper() const { return m_webThree->whisper(); }
-
-	NatSpecFace* natSpec() { return &m_natSpecDB; }
-
-	QVariant evalRaw(QString const& _js);
-
-	QString pretty(dev::Address _a) const override;
-	QString prettyU256(dev::u256 _n) const override;
-	QString render(dev::Address _a) const override;
-	dev::Address fromString(QString const& _a) const override;
-	std::string renderDiff(dev::eth::StateDiff const& _d) const override;
-
-	QList<dev::KeyPair> owned() const { return m_myIdentities + m_myKeys; }
-
-	dev::u256 gasPrice() const { return 10 * dev::eth::szabo; }
-
-public slots:
-	void load(QString _file);
-	void note(QString _entry);
-	void debug(QString _entry);
-	void warn(QString _entry);
-	QString contents(QString _file);
-
-	int authenticate(QString _title, QString _text);
-
-	void onKeysChanged();
-
-private slots:
-	void eval(QString const& _js);
-
-	// Application
-	void on_about_triggered();
-	void on_quit_triggered() { close(); }
-
-	// Network
-	void on_go_triggered();
-	void on_net_triggered();
-	void on_connect_triggered();
-	void on_idealPeers_valueChanged();
-
-	// Mining
-	void on_mine_triggered();
-
-	// View
-	void on_refresh_triggered();
-	void on_showAll_triggered() { refreshBlockChain(); }
-	void on_showAllAccounts_triggered() { refreshAccounts(); }
-	void on_preview_triggered();
-
-	// Account management
-	void on_newAccount_triggered();
-	void on_killAccount_triggered();
-	void on_importKey_triggered();
-	void on_importKeyFile_triggered();
-	void on_exportKey_triggered();
-
-	// Tools
-	void on_newTransaction_triggered();
-	void on_loadJS_triggered();
-
-	// Stuff concerning the blocks/transactions/accounts panels
-	void ourAccountsRowsMoved();
-	void on_ourAccounts_doubleClicked();
-	void on_accounts_doubleClicked();
-	void on_contracts_doubleClicked();
-	void on_contracts_currentItemChanged();
-	void on_transactionQueue_currentItemChanged();
-	void on_blockChainFilter_textChanged();
-	void on_blocks_currentItemChanged();
-
-	// Logging
-	void on_log_doubleClicked();
-	void on_verbosity_valueChanged();
-
-	// Misc
-	void on_urlEdit_returnPressed();
-	void on_jsInput_returnPressed();
-	void on_nameReg_textChanged();
-
-	// Special (debug) stuff
-	void on_paranoia_triggered();
-	void on_killBlockchain_triggered();
-	void on_clearPending_triggered();
-	void on_inject_triggered();
-	void on_forceMining_triggered();
-	void on_usePrivate_triggered();
-	void on_turboMining_triggered();
-	void on_jitvm_triggered();
-
-	// Debugger
-	void on_debugCurrent_triggered();
-	void on_debugDumpState_triggered(int _add = 1);
-	void on_debugDumpStatePre_triggered();
-
-	// Whisper
-	void on_newIdentity_triggered();
-	void on_post_clicked();
-
-	void refreshWhisper();
-	void refreshBlockChain();
-	void addNewId(QString _ids);
-
-signals:
-	void poll();
-
-private:
-	dev::p2p::NetworkPreferences netPrefs() const;
-
-	QString lookup(QString const& _n) const;
-	dev::Address getNameReg() const;
-	dev::Address getCurrencies() const;
-
-	void updateFee();
-	void readSettings(bool _skipGeometry = false);
-	void writeSettings();
-
-	unsigned installWatch(dev::eth::LogFilter const& _tf, WatchHandler const& _f);
-	unsigned installWatch(dev::h256 _tf, WatchHandler const& _f);
-	void uninstallWatch(unsigned _w);
-
-	void keysChanged();
-
-	void onNewPending();
-	void onNewBlock();
-	void onNameRegChange();
-	void onCurrenciesChange();
-	void onBalancesChange();
-
-	void installWatches();
-	void installCurrenciesWatch();
-	void installNameRegWatch();
-	void installBalancesWatch();
-
-	virtual void timerEvent(QTimerEvent*);
-
-	void refreshNetwork();
-	void refreshMining();
-	void refreshWhispers();
-
-	void refreshAll();
-	void refreshPending();
-	void refreshAccounts();
-	void refreshBlockCount();
-	void refreshBalances();
-
-	std::unique_ptr<Ui::Main> ui;
-
-	std::unique_ptr<dev::WebThreeDirect> m_webThree;
-
-	std::map<unsigned, WatchHandler> m_handlers;
-	unsigned m_nameRegFilter = (unsigned)-1;
-	unsigned m_currenciesFilter = (unsigned)-1;
-	unsigned m_balancesFilter = (unsigned)-1;
-
-	QByteArray m_networkConfig;
-	QStringList m_servers;
-	QList<dev::KeyPair> m_myKeys;
-	QList<dev::KeyPair> m_myIdentities;
-	QString m_privateChain;
-	dev::Address m_nameReg;
-
-	QNetworkAccessManager m_webCtrl;
-
-	QList<QPair<QString, QString>> m_consoleHistory;
-	QMutex m_logLock;
-	QString m_logHistory;
-	bool m_logChanged = true;
-
-	std::unique_ptr<jsonrpc::HttpServer> m_httpConnector;
-	std::unique_ptr<OurWebThreeStubServer> m_server;
-
-	static QString fromRaw(dev::h256 _n, unsigned* _inc = nullptr);
-	NatspecHandler m_natSpecDB;
-
-	Transact m_transact;
-};

alethzero/MiningView.cpp

@@ -1,118 +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 MiningView.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include "MiningView.h"
-
-#include <QtWidgets>
-#include <QtCore>
-#include <libethereum/Client.h>
-#include "Grapher.h"
-
-using namespace std;
-using namespace lb;
-
-// do *not* use eth since unsigned conflicts with Qt's global unit definition
-// using namespace dev;
-using namespace dev::eth;
-
-// types
-
-using dev::eth::MineInfo;
-using dev::eth::MineProgress;
-
-// functions
-using dev::toString;
-using dev::trimFront;
-
-string id(float _y) { return toString(_y); }
-string s(float _x){ return toString(round(_x * 1000) / 1000) + (!_x ? "s" : ""); }
-string sL(float _x, float _y) { return toString(round(_x * 1000)) + "s (" + toString(_y) + ")"; }
-
-MiningView::MiningView(QWidget* _p): QWidget(_p)
-{
-}
-
-void MiningView::appendStats(list<MineInfo> const& _i, MineProgress const& _p)
-{
-	if (_i.empty())
-		return;
-
-	unsigned o = m_values.size();
-	for (MineInfo const& i: _i)
-	{
-		m_values.push_back(i.best);
-		m_lastBest = min(m_lastBest, i.best);
-		m_bests.push_back(m_lastBest);
-		m_reqs.push_back(i.requirement);
-		if (i.completed)
-		{
-			m_completes.push_back(o);
-			m_resets.push_back(o);
-			m_haveReset = false;
-			m_lastBest = 1e99;
-		}
-		++o;
-	}
-	if (m_haveReset)
-	{
-		m_resets.push_back(o - 1);
-		m_lastBest = 1e99;
-		m_haveReset = false;
-	}
-
-	o = max<int>(0, (int)m_values.size() - (int)m_duration);
-	trimFront(m_values, o);
-	trimFront(m_bests, o);
-	trimFront(m_reqs, o);
-
-	for (auto& i: m_resets)
-		i -= o;
-	m_resets.erase(remove_if(m_resets.begin(), m_resets.end(), [](int i){return i < 0;}), m_resets.end());
-	for (auto& i: m_completes)
-		i -= o;
-	m_completes.erase(remove_if(m_completes.begin(), m_completes.end(), [](int i){return i < 0;}), m_completes.end());
-
-	m_progress = _p;
-	update();
-}
-
-void MiningView::resetStats()
-{
-	m_haveReset = true;
-}
-
-void MiningView::paintEvent(QPaintEvent*)
-{
-	Grapher g;
-	QPainter p(this);
-
-	g.init(&p, make_pair(0.f, max((float)m_duration * 0.1f, (float)m_values.size() * 0.1f)), make_pair(0.0f, 255.f - ((float)m_progress.requirement - 4.0f)), s, id, sL);
-	g.drawAxes();
-	g.setDataTransform(0.1f, 0, -1.0f, 255.f);
-
-	g.drawLineGraph(m_values, QColor(192, 192, 192));
-	g.drawLineGraph(m_bests, QColor(128, 128, 128));
-	g.drawLineGraph(m_reqs, QColor(128, 64, 64));
-	for (auto r: m_resets)
-		g.ruleY(r - 1, QColor(128, 128, 128));
-	for (auto r: m_completes)
-		g.ruleY(r, QColor(192, 64, 64));
-}

alethzero/MiningView.h

@@ -1,61 +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 MiningView.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#pragma once
-
-#ifdef Q_MOC_RUN
-#define BOOST_MPL_IF_HPP_INCLUDED
-#endif
-
-#include <list>
-#include <QtWidgets/QWidget>
-#ifndef Q_MOC_RUN
-#include <libethereum/Client.h>
-#endif
-
-namespace dev { namespace eth {
-struct MineInfo;
-}}
-
-class MiningView: public QWidget
-{
-	Q_OBJECT
-
-public:
-	MiningView(QWidget* _p = nullptr);
-
-	void appendStats(std::list<dev::eth::MineInfo> const& _l, dev::eth::MineProgress const& _p);
-	void resetStats();
-
-protected:
-	virtual void paintEvent(QPaintEvent*);
-
-private:
-	dev::eth::MineProgress m_progress;
-	unsigned m_duration = 300;
-	std::vector<float> m_values;
-	std::vector<float> m_bests;
-	std::vector<float> m_reqs;
-	std::vector<int> m_resets;
-	std::vector<int> m_completes;
-	double m_lastBest = 1e31;
-	bool m_haveReset = false;
-};

alethzero/NatspecHandler.cpp

@@ -1,101 +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 NatspecHandler.cpp
- * @author Lefteris Karapetsas <lefteris@ethdev.com>
- * @date 2015
- */
-#include "NatspecHandler.h"
-#include <string>
-#include <boost/filesystem.hpp>
-
-#include <libdevcore/Common.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Exceptions.h>
-#include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
-#include <libethereum/Defaults.h>
-
-using namespace dev;
-using namespace dev::eth;
-using namespace std;
-
-NatspecHandler::NatspecHandler()
-{
-	string path = Defaults::dbPath();
-	boost::filesystem::create_directories(path);
-	ldb::Options o;
-	o.create_if_missing = true;
-	ldb::DB::Open(o, path + "/natspec", &m_db);
-}
-
-NatspecHandler::~NatspecHandler()
-{
-	delete m_db;
-}
-
-void NatspecHandler::add(dev::h256 const& _contractHash, string const& _doc)
-{
-	m_db->Put(m_writeOptions, _contractHash.ref(), _doc);
-	cdebug << "Registering NatSpec: " << _contractHash.abridged() << _doc;
-}
-
-string NatspecHandler::retrieve(dev::h256 const& _contractHash) const
-{
-	string ret;
-	m_db->Get(m_readOptions, _contractHash.ref(), &ret);
-	cdebug << "Looking up NatSpec: " << _contractHash.abridged() << ret;
-	return ret;
-}
-
-string NatspecHandler::getUserNotice(string const& json, dev::bytes const& _transactionData)
-{
-	Json::Value natspec;
-	Json::Value userNotice;
-	m_reader.parse(json, natspec);
-
-	FixedHash<4> transactionFunctionHash((bytesConstRef(&_transactionData).cropped(0, 4).toBytes()));
-
-	Json::Value methods = natspec["methods"];
-	for (Json::ValueIterator it = methods.begin(); it != methods.end(); ++it)
-	{
-		Json::Value keyValue = it.key();
-		if (!keyValue.isString())
-			BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Illegal Natspec JSON detected"));
-
-		string functionSig = keyValue.asString();
-		FixedHash<4> functionHash(dev::sha3(functionSig));
-
-		if (functionHash == transactionFunctionHash)
-		{
-			Json::Value val = (*it)["notice"];
-			if (!val.isString())
-				BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Illegal Natspec JSON detected"));
-			return val.asString();
-		}
-	}
-
-	// not found
-	return string();
-}
-
-string NatspecHandler::getUserNotice(dev::h256 const& _contractHash, dev::bytes const& _transactionData)
-{
-	return getUserNotice(retrieve(_contractHash), _transactionData);
-}
-
-

alethzero/NatspecHandler.h

@@ -1,59 +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 NatspecHandler.h
- * @author Lefteris Karapetsas <lefteris@ethdev.com>
- * @date 2015
- */
-
-#pragma once
-
-#pragma warning(push)
-#pragma warning(disable: 4100 4267)
-#include <leveldb/db.h>
-#pragma warning(pop)
-#include <json/json.h>
-#include <libdevcore/FixedHash.h>
-#include "Context.h"
-
-namespace ldb = leveldb;
-
-class NatspecHandler: public NatSpecFace
-{
-  public:
-	NatspecHandler();
-	~NatspecHandler();
-
-	/// Stores locally in a levelDB a key value pair of contract code hash to natspec documentation
-	void add(dev::h256 const& _contractHash, std::string const& _doc);
-	/// Retrieves the natspec documentation as a string given a contract code hash
-	std::string retrieve(dev::h256 const& _contractHash) const override;
-
-	/// Given a json natspec string and the transaction data return the user notice
-	std::string getUserNotice(std::string const& json, const dev::bytes& _transactionData);
-	/// Given a contract code hash and the transaction's data retrieve the natspec documention's
-	/// user notice for that transaction.
-	/// @returns The user notice or an empty string if no natspec for the contract exists
-	///          or if the existing natspec does not document the @c _methodName
-	std::string getUserNotice(dev::h256 const& _contractHash, dev::bytes const& _transactionDacta);
-	
-  private:
-	ldb::ReadOptions m_readOptions;
-	ldb::WriteOptions m_writeOptions;
-	ldb::DB* m_db = nullptr;
-	Json::Reader m_reader;
-};

alethzero/OurWebThreeStubServer.cpp

@@ -1,119 +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 OurWebThreeStubServer.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include "OurWebThreeStubServer.h"
-
-#include <QMessageBox>
-#include <QAbstractButton>
-#include <libwebthree/WebThree.h>
-#include <libnatspec/NatspecExpressionEvaluator.h>
-
-#include "MainWin.h"
-
-using namespace std;
-using namespace dev;
-using namespace dev::eth;
-
-OurWebThreeStubServer::OurWebThreeStubServer(jsonrpc::AbstractServerConnector& _conn, WebThreeDirect& _web3,
-											 vector<KeyPair> const& _accounts, Main* main):
-	WebThreeStubServer(_conn, _web3, _accounts), m_web3(&_web3), m_main(main)
-{}
-
-string OurWebThreeStubServer::shh_newIdentity()
-{
-	KeyPair kp = dev::KeyPair::create();
-	emit onNewId(QString::fromStdString(toJS(kp.sec())));
-	return toJS(kp.pub());
-}
-
-bool OurWebThreeStubServer::showAuthenticationPopup(string const& _title, string const& _text) const
-{
-	int button;
-	QMetaObject::invokeMethod(m_main, "authenticate", Qt::BlockingQueuedConnection, Q_RETURN_ARG(int, button), Q_ARG(QString, QString::fromStdString(_title)), Q_ARG(QString, QString::fromStdString(_text)));
-	return button == QMessageBox::Ok;
-}
-
-bool OurWebThreeStubServer::showCreationNotice(TransactionSkeleton const& _t, bool _toProxy) const
-{
-	return showAuthenticationPopup("Contract Creation Transaction", string("ÐApp is attemping to create a contract; ") + (_toProxy ? "(this transaction is not executed directly, but forwarded to another ÐApp) " : "") + "to be endowed with " + formatBalance(_t.value) + ", with additional network fees of up to " + formatBalance(_t.gas * _t.gasPrice) + ".\n\nMaximum total cost is <b>" + formatBalance(_t.value + _t.gas * _t.gasPrice) + "</b>.");
-}
-
-bool OurWebThreeStubServer::showSendNotice(TransactionSkeleton const& _t, bool _toProxy) const
-{
-	return showAuthenticationPopup("Fund Transfer Transaction", "ÐApp is attempting to send " + formatBalance(_t.value) + " to a recipient " + m_main->pretty(_t.to).toStdString() + (_toProxy ? " (this transaction is not executed directly, but forwarded to another ÐApp)" : "") +
-", with additional network fees of up to " + formatBalance(_t.gas * _t.gasPrice) + ".\n\nMaximum total cost is <b>" + formatBalance(_t.value + _t.gas * _t.gasPrice) + "</b>.");
-}
-
-bool OurWebThreeStubServer::showUnknownCallNotice(TransactionSkeleton const& _t, bool _toProxy) const
-{
-	return showAuthenticationPopup("DANGEROUS! Unknown Contract Transaction!",
-		"ÐApp is attempting to call into an unknown contract at address " +
-		m_main->pretty(_t.to).toStdString() + ".\n\n" +
-		(_toProxy ? "This transaction is not executed directly, but forwarded to another ÐApp.\n\n" : "")  +
-		"Call involves sending " +
-		formatBalance(_t.value) + " to the recipient, with additional network fees of up to " +
-		formatBalance(_t.gas * _t.gasPrice) +
-		"However, this also does other stuff which we don't understand, and does so in your name.\n\n" +
-		"WARNING: This is probably going to cost you at least " +
-		formatBalance(_t.value + _t.gas * _t.gasPrice) +
-		", however this doesn't include any side-effects, which could be of far greater importance.\n\n" +
-		"REJECT UNLESS YOU REALLY KNOW WHAT YOU ARE DOING!");
-}
-
-bool OurWebThreeStubServer::authenticate(TransactionSkeleton const& _t, bool _toProxy)
-{
-	if (_t.creation)
-	{
-		// recipient has no code - nothing special about this transaction, show basic value transfer info
-		return showCreationNotice(_t, _toProxy);
-	}
-
-	h256 contractCodeHash = m_web3->ethereum()->postState().codeHash(_t.to);
-	if (contractCodeHash == EmptySHA3)
-	{
-		// recipient has no code - nothing special about this transaction, show basic value transfer info
-		return showSendNotice(_t, _toProxy);
-	}
-
-	string userNotice = m_main->natSpec()->getUserNotice(contractCodeHash, _t.data);
-
-	if (userNotice.empty())
-		return showUnknownCallNotice(_t, _toProxy);
-
-	NatspecExpressionEvaluator evaluator;
-	userNotice = evaluator.evalExpression(QString::fromStdString(userNotice)).toStdString();
-
-	// otherwise it's a transaction to a contract for which we have the natspec
-	return showAuthenticationPopup("Contract Transaction",
-		"ÐApp attempting to conduct contract interaction with " +
-		m_main->pretty(_t.to).toStdString() +
-		": <b>" + userNotice + "</b>.\n\n" +
-		(_toProxy ? "This transaction is not executed directly, but forwarded to another ÐApp.\n\n" : "") +
-		(_t.value > 0 ?
-			"In addition, ÐApp is attempting to send " +
-			formatBalance(_t.value) + " to said recipient, with additional network fees of up to " +
-			formatBalance(_t.gas * _t.gasPrice) + " = <b>" +
-			formatBalance(_t.value + _t.gas * _t.gasPrice) + "</b>."
-		:
-			"Additional network fees are at most" +
-			formatBalance(_t.gas * _t.gasPrice) + ".")
-		);
-}

alethzero/OurWebThreeStubServer.h

@@ -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 OurWebThreeStubServer.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include <QtCore/QObject>
-#include <libethcore/CommonJS.h>
-#include <libdevcrypto/Common.h>
-#include <libweb3jsonrpc/WebThreeStubServer.h>
-
-class Main;
-
-class OurWebThreeStubServer: public QObject, public WebThreeStubServer
-{
-	Q_OBJECT
-
-public:
-	OurWebThreeStubServer(jsonrpc::AbstractServerConnector& _conn, dev::WebThreeDirect& _web3,
-						  std::vector<dev::KeyPair> const& _accounts, Main* main);
-
-	virtual std::string shh_newIdentity() override;
-	virtual bool authenticate(dev::eth::TransactionSkeleton const& _t, bool _toProxy);
-
-signals:
-	void onNewId(QString _s);
-
-private:
-	bool showAuthenticationPopup(std::string const& _title, std::string const& _text) const;
-	bool showCreationNotice(dev::eth::TransactionSkeleton const& _t, bool _toProxy) const;
-	bool showSendNotice(dev::eth::TransactionSkeleton const& _t, bool _toProxy) const;
-	bool showUnknownCallNotice(dev::eth::TransactionSkeleton const& _t, bool _toProxy) const;
-
-	dev::WebThreeDirect* m_web3;
-	Main* m_main;
-};

alethzero/Transact.cpp

@@ -1,334 +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 Transact.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2015
- */
-
-#include "Transact.h"
-
-#include <fstream>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <liblll/Compiler.h>
-#include <liblll/CodeFragment.h>
-#include <libsolidity/CompilerStack.h>
-#include <libsolidity/Scanner.h>
-#include <libsolidity/AST.h>
-#include <libsolidity/SourceReferenceFormatter.h>
-#include <libnatspec/NatspecExpressionEvaluator.h>
-#include <libethereum/Client.h>
-#include <libethereum/Utility.h>
-#ifndef _MSC_VER
-#include <libserpent/funcs.h>
-#include <libserpent/util.h>
-#endif
-#include "Debugger.h"
-#include "ui_Transact.h"
-using namespace std;
-using namespace dev;
-using namespace dev::eth;
-
-Transact::Transact(Context* _c, QWidget* _parent):
-	QDialog(_parent),
-	ui(new Ui::Transact),
-	m_context(_c)
-{
-	ui->setupUi(this);
-
-	initUnits(ui->gasPriceUnits);
-	initUnits(ui->valueUnits);
-	ui->valueUnits->setCurrentIndex(6);
-	ui->gasPriceUnits->setCurrentIndex(4);
-	ui->gasPrice->setValue(10);
-	on_destination_currentTextChanged();
-}
-
-Transact::~Transact()
-{
-	delete ui;
-}
-
-void Transact::setEnvironment(QList<dev::KeyPair> _myKeys, dev::eth::Client* _eth, NatSpecFace* _natSpecDB)
-{
-	m_myKeys = _myKeys;
-	m_ethereum = _eth;
-	m_natSpecDB = _natSpecDB;
-}
-
-bool Transact::isCreation() const
-{
-	return ui->destination->currentText().isEmpty() || ui->destination->currentText() == "(Create Contract)";
-}
-
-u256 Transact::fee() const
-{
-	return ui->gas->value() * gasPrice();
-}
-
-u256 Transact::value() const
-{
-	if (ui->valueUnits->currentIndex() == -1)
-		return 0;
-	return ui->value->value() * units()[units().size() - 1 - ui->valueUnits->currentIndex()].first;
-}
-
-u256 Transact::gasPrice() const
-{
-	if (ui->gasPriceUnits->currentIndex() == -1)
-		return 0;
-	return ui->gasPrice->value() * units()[units().size() - 1 - ui->gasPriceUnits->currentIndex()].first;
-}
-
-u256 Transact::total() const
-{
-	return value() + fee();
-}
-
-void Transact::updateDestination()
-{
-	cwatch << "updateDestination()";
-	QString s;
-	for (auto i: ethereum()->addresses())
-		if ((s = m_context->pretty(i)).size())
-			// A namereg address
-			if (ui->destination->findText(s, Qt::MatchExactly | Qt::MatchCaseSensitive) == -1)
-				ui->destination->addItem(s);
-	for (int i = 0; i < ui->destination->count(); ++i)
-		if (ui->destination->itemText(i) != "(Create Contract)" && !m_context->fromString(ui->destination->itemText(i)))
-			ui->destination->removeItem(i--);
-}
-
-void Transact::updateFee()
-{
-	ui->fee->setText(QString("(gas sub-total: %1)").arg(formatBalance(fee()).c_str()));
-	auto totalReq = total();
-	ui->total->setText(QString("Total: %1").arg(formatBalance(totalReq).c_str()));
-
-	bool ok = false;
-	for (auto i: m_myKeys)
-		if (ethereum()->balanceAt(i.address()) >= totalReq)
-		{
-			ok = true;
-			break;
-		}
-	ui->send->setEnabled(ok);
-	QPalette p = ui->total->palette();
-	p.setColor(QPalette::WindowText, QColor(ok ? 0x00 : 0x80, 0x00, 0x00));
-	ui->total->setPalette(p);
-}
-
-string Transact::getFunctionHashes(dev::solidity::CompilerStack const& _compiler, string const& _contractName)
-{
-	string ret = "";
-	auto const& contract = _compiler.getContractDefinition(_contractName);
-	auto interfaceFunctions = contract.getInterfaceFunctions();
-
-	for (auto const& it: interfaceFunctions)
-	{
-		ret += it.first.abridged();
-		ret += " :";
-		ret += it.second->getDeclaration().getName() + "\n";
-	}
-	return ret;
-}
-
-void Transact::on_destination_currentTextChanged()
-{
-	if (ui->destination->currentText().size() && ui->destination->currentText() != "(Create Contract)")
-		if (Address a = m_context->fromString(ui->destination->currentText()))
-			ui->calculatedName->setText(m_context->render(a));
-		else
-			ui->calculatedName->setText("Unknown Address");
-	else
-		ui->calculatedName->setText("Create Contract");
-	rejigData();
-//	updateFee();
-}
-
-void Transact::rejigData()
-{
-	if (isCreation())
-	{
-		string src = ui->data->toPlainText().toStdString();
-		vector<string> errors;
-		QString lll;
-		QString solidity;
-		if (src.find_first_not_of("1234567890abcdefABCDEF") == string::npos && src.size() % 2 == 0)
-			m_data = fromHex(src);
-		else if (sourceIsSolidity(src))
-		{
-			dev::solidity::CompilerStack compiler;
-			try
-			{
-//				compiler.addSources(dev::solidity::StandardSources);
-				m_data = compiler.compile(src, ui->optimize->isChecked());
-				solidity = "<h4>Solidity</h4>";
-				solidity += "<pre>var " + QString::fromStdString(compiler.defaultContractName()) + " = web3.eth.contractFromAbi(" + QString::fromStdString(compiler.getInterface()).replace(QRegExp("\\s"), "").toHtmlEscaped() + ");</pre>";
-				solidity += "<pre>" + QString::fromStdString(compiler.getSolidityInterface()).toHtmlEscaped() + "</pre>";
-				solidity += "<pre>" + QString::fromStdString(getFunctionHashes(compiler)).toHtmlEscaped() + "</pre>";
-			}
-			catch (dev::Exception const& exception)
-			{
-				ostringstream error;
-				solidity::SourceReferenceFormatter::printExceptionInformation(error, exception, "Error", compiler);
-				solidity = "<h4>Solidity</h4><pre>" + QString::fromStdString(error.str()).toHtmlEscaped() + "</pre>";
-			}
-			catch (...)
-			{
-				solidity = "<h4>Solidity</h4><pre>Uncaught exception.</pre>";
-			}
-		}
-#ifndef _MSC_VER
-		else if (sourceIsSerpent(src))
-		{
-			try
-			{
-				m_data = dev::asBytes(::compile(src));
-				for (auto& i: errors)
-					i = "(LLL " + i + ")";
-			}
-			catch (string const& err)
-			{
-				errors.push_back("Serpent " + err);
-			}
-		}
-#endif
-		else
-		{
-			m_data = compileLLL(src, ui->optimize->isChecked(), &errors);
-			if (errors.empty())
-			{
-				auto asmcode = compileLLLToAsm(src, false);
-				lll = "<h4>Pre</h4><pre>" + QString::fromStdString(asmcode).toHtmlEscaped() + "</pre>";
-				if (ui->optimize->isChecked())
-				{
-					asmcode = compileLLLToAsm(src, true);
-					lll = "<h4>Opt</h4><pre>" + QString::fromStdString(asmcode).toHtmlEscaped() + "</pre>" + lll;
-				}
-			}
-		}
-		QString errs;
-		if (errors.size())
-		{
-			errs = "<h4>Errors</h4>";
-			for (auto const& i: errors)
-				errs.append("<div style=\"border-left: 6px solid #c00; margin-top: 2px\">" + QString::fromStdString(i).toHtmlEscaped() + "</div>");
-		}
-		ui->code->setHtml(errs + lll + solidity + "<h4>Code</h4>" + QString::fromStdString(disassemble(m_data)).toHtmlEscaped() + "<h4>Hex</h4>" Div(Mono) + QString::fromStdString(toHex(m_data)) + "</div>");
-		ui->gas->setMinimum((qint64)Interface::txGas(m_data, 0));
-		if (!ui->gas->isEnabled())
-			ui->gas->setValue(m_backupGas);
-		ui->gas->setEnabled(true);
-	}
-	else
-	{
-		m_data = parseData(ui->data->toPlainText().toStdString());
-		auto to = m_context->fromString(ui->destination->currentText());
-		QString natspec;
-		if (ethereum()->codeAt(to, 0).size())
-		{
-			string userNotice = m_natSpecDB->getUserNotice(ethereum()->postState().codeHash(to), m_data);
-			if (userNotice.empty())
-				natspec = "Destination contract unknown.";
-			else
-			{
-				NatspecExpressionEvaluator evaluator;
-				natspec = evaluator.evalExpression(QString::fromStdString(userNotice));
-			}
-			ui->gas->setMinimum((qint64)Interface::txGas(m_data, 1));
-			if (!ui->gas->isEnabled())
-				ui->gas->setValue(m_backupGas);
-			ui->gas->setEnabled(true);
-		}
-		else
-		{
-			natspec += "Destination not a contract.";
-			if (ui->gas->isEnabled())
-				m_backupGas = ui->gas->value();
-			ui->gas->setValue((qint64)Interface::txGas(m_data));
-			ui->gas->setEnabled(false);
-		}
-		ui->code->setHtml("<h3>NatSpec</h3>" + natspec + "<h3>Dump</h3>" + QString::fromStdString(dev::memDump(m_data, 8, true)) + "<h3>Hex</h3>" + Div(Mono) + QString::fromStdString(toHex(m_data)) + "</div>");
-	}
-	updateFee();
-}
-
-void Transact::on_send_clicked()
-{
-	u256 totalReq = value() + fee();
-	for (auto const& i: m_myKeys)
-		if (ethereum()->balanceAt(i.address(), 0) >= totalReq)
-		{
-			Secret s = i.secret();
-			if (isCreation())
-			{
-				// If execution is a contract creation, add Natspec to
-				// a local Natspec LEVELDB
-				ethereum()->transact(s, value(), m_data, ui->gas->value(), gasPrice());
-				string src = ui->data->toPlainText().toStdString();
-				if (sourceIsSolidity(src))
-					try
-					{
-						dev::solidity::CompilerStack compiler;
-						m_data = compiler.compile(src, ui->optimize->isChecked());
-						for (string const& s: compiler.getContractNames())
-						{
-							h256 contractHash = compiler.getContractCodeHash(s);
-							m_natSpecDB->add(contractHash, compiler.getMetadata(s, dev::solidity::DocumentationType::NatspecUser));
-						}
-					}
-					catch (...)
-					{
-					}
-				close();
-				return;
-			}
-			else
-				ethereum()->transact(s, value(), m_context->fromString(ui->destination->currentText()), m_data, ui->gas->value(), gasPrice());
-			return;
-		}
-	QMessageBox::critical(this, "Transaction Failed", "Couldn't make transaction: no single account contains at least the required amount.");
-}
-
-void Transact::on_debug_clicked()
-{
-	try
-	{
-		u256 totalReq = value() + fee();
-		for (auto i: m_myKeys)
-			if (ethereum()->balanceAt(i.address()) >= totalReq)
-			{
-				State st(ethereum()->postState());
-				Secret s = i.secret();
-				Transaction t = isCreation() ?
-					Transaction(value(), gasPrice(), ui->gas->value(), m_data, st.transactionsFrom(dev::toAddress(s)), s) :
-					Transaction(value(), gasPrice(), ui->gas->value(), m_context->fromString(ui->destination->currentText()), m_data, st.transactionsFrom(dev::toAddress(s)), s);
-				Debugger dw(m_context, this);
-				Executive e(st, ethereum()->blockChain(), 0);
-				dw.populate(e, t);
-				dw.exec();
-				return;
-			}
-			QMessageBox::critical(this, "Transaction Failed", "Couldn't make transaction: no single account contains at least the required amount.");
-	}
-	catch (dev::Exception const& _e)
-	{
-		QMessageBox::critical(this, "Transaction Failed", "Couldn't make transaction. Low-level error: " + QString::fromStdString(diagnostic_information(_e)));
-		// this output is aimed at developers, reconsider using _e.what for more user friendly output.
-	}
-}

alethzero/Transact.h

@@ -1,82 +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 Transact.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2015
- */
-
-#pragma once
-
-#include <libdevcore/RLP.h>
-#include <libethcore/CommonEth.h>
-#include <libethereum/Transaction.h>
-#include <QDialog>
-#include <QMap>
-#include <QList>
-#include "Context.h"
-
-namespace Ui { class Transact; }
-namespace dev { namespace eth { class Client; } }
-namespace dev { namespace solidity { class CompilerStack; } }
-
-class Transact: public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit Transact(Context* _context, QWidget* _parent = 0);
-	~Transact();
-
-	void setEnvironment(QList<dev::KeyPair> _myKeys, dev::eth::Client* _eth, NatSpecFace* _natSpecDB);
-
-private slots:
-	void on_destination_currentTextChanged();
-	void on_value_valueChanged() { updateFee(); }
-	void on_gas_valueChanged() { updateFee(); }
-	void on_valueUnits_currentIndexChanged() { updateFee(); }
-	void on_gasPriceUnits_currentIndexChanged() { updateFee(); }
-	void on_gasPrice_valueChanged() { updateFee(); }
-	void on_data_textChanged() { rejigData(); }
-	void on_optimize_clicked() { rejigData(); }
-	void on_send_clicked();
-	void on_debug_clicked();
-	void on_cancel_clicked() { close(); }
-
-private:
-	dev::eth::Client* ethereum() { return m_ethereum; }
-	void rejigData();
-
-	void updateDestination();
-	void updateFee();
-	bool isCreation() const;
-	dev::u256 fee() const;
-	dev::u256 total() const;
-	dev::u256 value() const;
-	dev::u256 gasPrice() const;
-
-	std::string getFunctionHashes(dev::solidity::CompilerStack const& _compiler, std::string const& _contractName = std::string());
-
-	Ui::Transact* ui;
-
-	unsigned m_backupGas;
-	dev::bytes m_data;
-
-	QList<dev::KeyPair> m_myKeys;
-	dev::eth::Client* m_ethereum;
-	Context* m_context;
-	NatSpecFace* m_natSpecDB;
-};

alethzero/Transact.ui

@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Transact</class>
- <widget class="QDialog" name="Transact">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>543</width>
-    <height>695</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="1" colspan="2">
-    <widget class="QSpinBox" name="value">
-     <property name="suffix">
-      <string/>
-     </property>
-     <property name="maximum">
-      <number>430000000</number>
-     </property>
-     <property name="value">
-      <number>0</number>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label5_2">
-     <property name="text">
-      <string>&amp;Amount</string>
-     </property>
-     <property name="buddy">
-      <cstring>value</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="3">
-    <widget class="QLineEdit" name="calculatedName">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="placeholderText">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="4">
-    <widget class="QSplitter" name="splitter_5">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <widget class="QPlainTextEdit" name="data">
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="lineWidth">
-       <number>0</number>
-      </property>
-     </widget>
-     <widget class="QTextEdit" name="code">
-      <property name="focusPolicy">
-       <enum>Qt::ClickFocus</enum>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="lineWidth">
-       <number>0</number>
-      </property>
-      <property name="readOnly">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </widget>
-   </item>
-   <item row="3" column="3">
-    <widget class="QComboBox" name="gasPriceUnits"/>
-   </item>
-   <item row="4" column="1" colspan="2">
-    <widget class="QLabel" name="fee">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label5">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>&amp;To</string>
-     </property>
-     <property name="buddy">
-      <cstring>destination</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="3">
-    <widget class="QComboBox" name="valueUnits"/>
-   </item>
-   <item row="7" column="2">
-    <widget class="QPushButton" name="debug">
-     <property name="text">
-      <string>&amp;Debug</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="3">
-    <widget class="QPushButton" name="send">
-     <property name="text">
-      <string>&amp;Execute</string>
-     </property>
-     <property name="default">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>&amp;Gas</string>
-     </property>
-     <property name="buddy">
-      <cstring>gas</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QSpinBox" name="gas">
-     <property name="suffix">
-      <string> gas</string>
-     </property>
-     <property name="minimum">
-      <number>1</number>
-     </property>
-     <property name="maximum">
-      <number>430000000</number>
-     </property>
-     <property name="value">
-      <number>10000</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2">
-    <widget class="QSpinBox" name="gasPrice">
-     <property name="prefix">
-      <string>@ </string>
-     </property>
-     <property name="minimum">
-      <number>1</number>
-     </property>
-     <property name="maximum">
-      <number>430000000</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="3">
-    <widget class="QCheckBox" name="optimize">
-     <property name="text">
-      <string>&amp;Optimise</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>D&amp;ata</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-     <property name="buddy">
-      <cstring>data</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="3">
-    <widget class="QComboBox" name="destination">
-     <property name="editable">
-      <bool>true</bool>
-     </property>
-     <item>
-      <property name="text">
-       <string>(Create Contract)</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="6" column="0" colspan="4">
-    <widget class="QLabel" name="total">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0">
-    <widget class="QPushButton" name="cancel">
-     <property name="text">
-      <string>&amp;Cancel</string>
-     </property>
-     <property name="shortcut">
-      <string>Esc</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

alethzero/alethzero.rc

@@ -1 +0,0 @@
-APP_ICON ICON DISCARDABLE "alethzero.ico"

alethzero/main.cpp

@@ -1,12 +0,0 @@
-#include "MainWin.h"
-#include <QtWidgets/QApplication>
-
-int main(int argc, char *argv[])
-{
-	QApplication a(argc, argv);
-	Q_INIT_RESOURCE(js);
-	Main w;
-	w.show();
-	
-	return a.exec();
-}

astylerc

@@ -1,11 +0,0 @@
-style=allman
-indent=force-tab=4
-convert-tabs
-indent-preprocessor
-min-conditional-indent=1
-pad-oper
-pad-header
-unpad-paren
-align-pointer=type
-keep-one-line-blocks
-close-templates

cmake/EthCompilerSettings.cmake

@@ -1,49 +0,0 @@
-# Set necessary compile and link flags
-
-# C++11 check and activation
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-
-	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -DSHAREDLIB -fPIC")
-	set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DETH_DEBUG")
-	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DETH_RELEASE")
-	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -DETH_RELEASE")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DETH_DEBUG")
-	set(ETH_SHARED 1)
-
-	execute_process(
-		COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-	if (NOT (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7))
-		message(FATAL_ERROR "${PROJECT_NAME} requires g++ 4.7 or greater.")
-	endif ()
-
-elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-
-	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -DSHAREDLIB -fPIC")
-	set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DETH_DEBUG")
-	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DETH_RELEASE")
-	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -DETH_RELEASE")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DETH_DEBUG")
-	set(ETH_SHARED 1)
-
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-
-	# enable parallel compilation
-	# specify Exception Handling Model in msvc
-	# disable unknown pragma warning (4068)
-	# disable unsafe function warning (4996)
-	# disable decorated name length exceeded, name was truncated (4503)
-	# disable warning C4535: calling _set_se_translator() requires /EHa (for boost tests)
-	# declare Windows XP requirement
-	add_compile_options(/MP /EHsc /wd4068 /wd4996 /wd4503 -D_WIN32_WINNT=0x0501)
-	# disable empty object file warning
-	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
-	# warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/SAFESEH' specification 
-	# warning LNK4099: pdb was not found with lib
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099,4075")
-	# windows likes static
-	set(ETH_STATIC 1)
-
-else ()
-	message(WARNING "Your compiler is not tested, if you run into any issues, we'd welcome any patches.")
-endif ()
-

cmake/EthDependencies.cmake

@@ -1,178 +0,0 @@
-# all dependencies that are not directly included in the cpp-ethereum distribution are defined here
-# for this to work, download the dependency via the cmake script in extdep or install them manually!
-
-# by defining this variable, cmake will look for dependencies first in our own repository before looking in system paths like /usr/local/ ...
-# this must be set to point to the same directory as $ETH_DEPENDENCY_INSTALL_DIR in /extdep directory
-string(TOLOWER ${CMAKE_SYSTEM_NAME} _system_name)
-set (ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extdep/install/${_system_name}")
-set (CMAKE_PREFIX_PATH ${ETH_DEPENDENCY_INSTALL_DIR})
-
-# setup directory for cmake generated files and include it globally 
-# it's not used yet, but if we have more generated files, consider moving them to ETH_GENERATED_DIR
-set(ETH_GENERATED_DIR "${PROJECT_BINARY_DIR}/gen")
-include_directories(${ETH_GENERATED_DIR})
-
-# custom cmake scripts
-set(ETH_SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/cmake/scripts)
-
-# Qt5 requires opengl
-# TODO use proper version of windows SDK (32 vs 64)
-# TODO make it possible to use older versions of windows SDK (7.0+ should also work)
-# TODO it windows SDK is NOT FOUND, throw ERROR
-if (WIN32)
-	set (CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "C:/Program Files/Windows Kits/8.1/Lib/winv6.3/um/x86")
-	message(" - Found windows 8.1 SDK")
-	#set (CMAKE_PREFIX_PATH "C:/Program Files/Windows Kits/8.1/Lib/winv6.3/um/x64")
-endif()
-
-# homebrew installs qts in opt
-if (APPLE)
-	set (CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "/usr/local/opt/qt5")
-endif()
-
-# Dependencies must have a version number, to ensure reproducible build. The version provided here is the one that is in the extdep repository. If you use system libraries, version numbers may be different.
-
-find_package (CryptoPP 5.6.2 EXACT REQUIRED)
-message(" - CryptoPP header: ${CRYPTOPP_INCLUDE_DIRS}")
-message(" - CryptoPP lib   : ${CRYPTOPP_LIBRARIES}")
-
-find_package (LevelDB REQUIRED)
-message(" - LevelDB header: ${LEVELDB_INCLUDE_DIRS}")
-message(" - LevelDB lib: ${LEVELDB_LIBRARIES}")
-
-# TODO the Jsoncpp package does not yet check for correct version number
-find_package (Jsoncpp 0.60 REQUIRED)
-message(" - Jsoncpp header: ${JSONCPP_INCLUDE_DIRS}")
-message(" - Jsoncpp lib   : ${JSONCPP_LIBRARIES}")
-
-# TODO the JsonRpcCpp package does not yet check for correct version number
-# json-rpc-cpp support is currently not mandatory
-# TODO make headless client optional
-# TODO get rid of -DETH_JSONRPC
-if (JSONRPC)
-
-	find_package (JsonRpcCpp 0.3.2)
-	if (NOT JSON_RPC_CPP_FOUND)
-		message (FATAL_ERROR "JSONRPC 0.3.2. not found")
-	endif()
-	message (" - json-rpc-cpp header: ${JSON_RPC_CPP_INCLUDE_DIRS}")
-	message (" - json-rpc-cpp lib   : ${JSON_RPC_CPP_LIBRARIES}")
-	add_definitions(-DETH_JSONRPC)
-
- 	find_package(MHD) 
-	message(" - microhttpd header: ${MHD_INCLUDE_DIRS}")
-	message(" - microhttpd lib   : ${MHD_LIBRARIES}")
-
-endif() #JSONRPC
-
-# TODO readline package does not yet check for correct version number
-# TODO make readline package dependent on cmake options
-# TODO get rid of -DETH_READLINE
-find_package (Readline 6.3.8)
-if (READLINE_FOUND)
-	message (" - readline header: ${READLINE_INCLUDE_DIRS}")
-	message (" - readline lib   : ${READLINE_LIBRARIES}")
-	add_definitions(-DETH_READLINE)
-endif ()
-
-# TODO miniupnpc package does not yet check for correct version number
-# TODO make miniupnpc package dependent on cmake options
-# TODO get rid of -DMINIUPNPC
-find_package (Miniupnpc 1.8.2013)
-if (MINIUPNPC_FOUND)
-	message (" - miniupnpc header: ${MINIUPNPC_INCLUDE_DIRS}")
-	message (" - miniupnpc lib   : ${MINIUPNPC_LIBRARIES}")
-	add_definitions(-DETH_MINIUPNPC)
-endif()
-
-# TODO gmp package does not yet check for correct version number
-# TODO it is also not required in msvc build
-find_package (Gmp 6.0.0)
-if (GMP_FOUND)
-	message(" - gmp Header: ${GMP_INCLUDE_DIRS}")
-	message(" - gmp lib   : ${GMP_LIBRARIES}")
-endif()
-
-# curl is only requried for tests
-# TODO specify min curl version, on windows we are currently using 7.29
-find_package (CURL)
-message(" - curl header: ${CURL_INCLUDE_DIRS}")
-message(" - curl lib   : ${CURL_LIBRARIES}")
-
-# find location of jsonrpcstub
-find_program(ETH_JSON_RPC_STUB jsonrpcstub)
-message(" - jsonrpcstub location    : ${ETH_JSON_RPC_STUB}")
-
-# do not compile GUI
-if (NOT HEADLESS) 
-
-# we need json rpc to build alethzero
-	if (NOT JSON_RPC_CPP_FOUND)
-		message (FATAL_ERROR "JSONRPC is required for GUI client")
-	endif()
-
-# find all of the Qt packages
-# remember to use 'Qt' instead of 'QT', cause unix is case sensitive
-# TODO make headless client optional
-	find_package (Qt5Core REQUIRED)
-	find_package (Qt5Gui REQUIRED)
-	find_package (Qt5Quick REQUIRED)
-	find_package (Qt5Qml REQUIRED)
-	find_package (Qt5Network REQUIRED)
-	find_package (Qt5Widgets REQUIRED)
-	find_package (Qt5WebKit REQUIRED)
-	find_package (Qt5WebKitWidgets REQUIRED)
-
-	# we need to find path to macdeployqt on mac
-	if (APPLE)
-		set (MACDEPLOYQT_APP ${Qt5Core_DIR}/../../../bin/macdeployqt)
-		message(" - macdeployqt path: ${MACDEPLOYQT_APP}")
-	endif()
-	# we need to find path to windeployqt on windows
-	if (WIN32)
-		set (WINDEPLOYQT_APP ${Qt5Core_DIR}/../../../bin/windeployqt)
-		message(" - windeployqt path: ${WINDEPLOYQT_APP}")
-	endif()
-
-# TODO check node && npm version
-	find_program(ETH_NODE node)
-	string(REGEX REPLACE "node" "" ETH_NODE_DIRECTORY ${ETH_NODE})
-	message(" - nodejs location : ${ETH_NODE}")
-
-	find_program(ETH_NPM npm)
-	string(REGEX REPLACE "npm" "" ETH_NPM_DIRECTORY ${ETH_NPM})
-	message(" - npm location    : ${ETH_NPM}")
-
-endif() #HEADLESS
-
-# use multithreaded boost libraries, with -mt suffix
-set(Boost_USE_MULTITHREADED ON)
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-
-# TODO hanlde other msvc versions or it will fail find them
-	set(Boost_COMPILER -vc120)
-# use static boost libraries *.lib
-	set(Boost_USE_STATIC_LIBS ON) 
-
-elseif (APPLE)
-
-# use static boost libraries *.a
-	set(Boost_USE_STATIC_LIBS ON) 
-
-elseif (UNIX)
-# use dynamic boost libraries .dll
-	set(Boost_USE_STATIC_LIBS OFF) 
-
-endif()
-
-find_package(Boost 1.54.0 REQUIRED COMPONENTS thread date_time system regex chrono filesystem unit_test_framework program_options)
-
-message(" - boost header: ${Boost_INCLUDE_DIRS}")
-message(" - boost lib   : ${Boost_LIBRARIES}")
-
-if (APPLE)
-	link_directories(/usr/local/lib)
-	include_directories(/usr/local/include)
-endif()
-

cmake/EthExecutableHelper.cmake

@@ -1,113 +0,0 @@
-#
-# this function requires the following variables to be specified:
-# ETH_VERSION
-# PROJECT_NAME
-# PROJECT_VERSION
-# PROJECT_COPYRIGHT_YEAR
-# PROJECT_VENDOR
-# PROJECT_DOMAIN_SECOND
-# PROJECT_DOMAIN_FIRST
-# SRC_LIST
-# HEADERS
-#
-# params:
-# ICON
-#
-
-macro(eth_add_executable EXECUTABLE)
-	set (extra_macro_args ${ARGN})
-	set (options)
-	set (one_value_args ICON)
-	set (multi_value_args UI_RESOURCES WIN_RESOURCES)
-	cmake_parse_arguments (ETH_ADD_EXECUTABLE "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
-
-	if (APPLE)
-
-		add_executable(${EXECUTABLE} MACOSX_BUNDLE ${SRC_LIST} ${HEADERS} ${ETH_ADD_EXECUTABLE_UI_RESOURCES})
-		set(PROJECT_VERSION "${ETH_VERSION}")
-		set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
-		set(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_NAME} ${PROJECT_VERSION}")
-		set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
-		set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}")
-		set(MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT_YEAR} ${PROJECT_VENDOR}")
-		set(MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_DOMAIN_SECOND}.${PROJECT_DOMAIN_FIRST}")
-		set(MACOSX_BUNDLE_BUNDLE_NAME ${EXECUTABLE})
-		set(MACOSX_BUNDLE_ICON_FILE ${ETH_ADD_EXECUTABLE_ICON})
-		set_target_properties(${EXECUTABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
-		set_source_files_properties(${EXECUTABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
-		set_source_files_properties(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
-	else ()
-		add_executable(${EXECUTABLE} ${ETH_ADD_EXECUTABLE_UI_RESOURCES}  ${ETH_ADD_EXECUTABLE_WIN_RESOURCES} ${SRC_LIST} ${HEADERS})
-	endif()
-
-endmacro()
-
-# 
-# this function requires the following variables to be specified:
-# ETH_DEPENDENCY_INSTALL_DIR
-#
-# params: 
-# QMLDIR
-#
-
-macro(eth_install_executable EXECUTABLE)
-
-	set (extra_macro_args ${ARGN})
-	set (options)
-	set (one_value_args QMLDIR)
-	set (multi_value_args)
-	cmake_parse_arguments (ETH_INSTALL_EXECUTABLE "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
-	
-	if (ETH_INSTALL_EXECUTABLE_QMLDIR)
-		if (APPLE)
-			set(eth_qml_dir "-qmldir=${ETH_INSTALL_EXECUTABLE_QMLDIR}")
-		elseif (WIN32)
-			set(eth_qml_dir "--qmldir ${ETH_INSTALL_EXECUTABLE_QMLDIR}")
-		endif()
-		message(STATUS "${EXECUTABLE} qmldir: ${eth_qml_dir}")
-	endif()
-
-	if (APPLE)
-		# First have qt5 install plugins and frameworks
-		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-			COMMAND ${MACDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app -executable=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents/MacOS/${EXECUTABLE} ${eth_qml_dir}
-			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-			COMMAND sh ${CMAKE_SOURCE_DIR}/macdeployfix.sh ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents
-		)
-			
-		# This tool and next will inspect linked libraries in order to determine which dependencies are required
-		if (${CMAKE_CFG_INTDIR} STREQUAL ".")
-			set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}.app")
-		else ()
-			set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/\$ENV{CONFIGURATION}/${EXECUTABLE}.app")
-		endif ()
-
-		install(CODE "
-			include(BundleUtilities)
-			set(BU_CHMOD_BUNDLE_ITEMS 1)
-			verify_app(\"${APP_BUNDLE_PATH}\")
-			" COMPONENT RUNTIME )
-
-	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-			COMMAND cmd /C "set PATH=${Qt5Core_DIR}/../../../bin;%PATH% && ${WINDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.exe ${eth_qml_dir}"
-			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-		)
-		#workaround for https://bugreports.qt.io/browse/QTBUG-42083
-		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-			COMMAND cmd /C "(echo [Paths] & echo.Prefix=.)" > "qt.conf"
-			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} VERBATIM
-		)
-		install( TARGETS ${EXECUTABLE} RUNTIME 
-			DESTINATION bin
-			COMPONENT ${EXECUTABLE}
-		)
-
-	else()
-		install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
-	endif ()
-
-endmacro()
-
-

cmake/EthUtils.cmake

@@ -1,24 +0,0 @@
-#
-# renames the file if it is different from its destination
-include(CMakeParseArguments)
-#
-macro(replace_if_different SOURCE DST)
-	set(extra_macro_args ${ARGN})
-	set(options CREATE)
-	set(one_value_args)
-	set(multi_value_args)
-	cmake_parse_arguments(REPLACE_IF_DIFFERENT "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
-
-	if (REPLACE_IF_DIFFERENT_CREATE AND (NOT (EXISTS "${DST}")))
-		file(WRITE "${DST}" "")
-	endif()
-
-	execute_process(COMMAND ${CMAKE_COMMAND} -E compare_files "${SOURCE}" "${DST}" RESULT_VARIABLE DIFFERENT)
-
-	if (DIFFERENT)
-		execute_process(COMMAND ${CMAKE_COMMAND} -E rename "${SOURCE}" "${DST}")
-	else()
-		execute_process(COMMAND ${CMAKE_COMMAND} -E remove "${SOURCE}")
-	endif()
-endmacro()
-

cmake/FindCURL.cmake

@@ -1,49 +0,0 @@
-# Find CURL
-#
-# Find the curl includes and library
-# 
-# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH 
-# 
-# This module defines
-#  CURL_INCLUDE_DIRS, where to find header, etc.
-#  CURL_LIBRARIES, the libraries needed to use curl.
-#  CURL_FOUND, If false, do not try to use curl.
-
-# only look in default directories
-find_path(
-	CURL_INCLUDE_DIR 
-	NAMES curl/curl.h
-	DOC "curl include dir"
-)
-
-find_library(
-	CURL_LIBRARY
-	# names from cmake's FindCURL
-	NAMES curl curllib libcurl_imp curllib_static libcurl
-	DOC "curl library"
-)
-
-set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
-set(CURL_LIBRARIES ${CURL_LIBRARY})
-
-# debug library on windows
-# same naming convention as in qt (appending debug library with d)
-# boost is using the same "hack" as us with "optimized" and "debug"
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-	find_library(
-		CURL_LIBRARY_DEBUG
-		NAMES curld libcurld
-		DOC "curl debug library"
-	)
-	
-	set(CURL_LIBRARIES optimized ${CURL_LIBRARIES} debug ${CURL_LIBRARY_DEBUG})
-
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE
-# if all listed variables are TRUE, hide their existence from configuration view
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CURL DEFAULT_MSG
-	CURL_INCLUDE_DIR CURL_LIBRARY)
-mark_as_advanced (CURL_INCLUDE_DIR CURL_LIBRARY)
-

cmake/FindCryptoPP.cmake

@@ -1,108 +0,0 @@
-# Module for locating the Crypto++ encryption library.
-#
-# Customizable variables:
-#   CRYPTOPP_ROOT_DIR
-#     This variable points to the CryptoPP root directory. On Windows the
-#     library location typically will have to be provided explicitly using the
-#     -D command-line option. The directory should include the include/cryptopp,
-#     lib and/or bin sub-directories.
-#
-# Read-only variables:
-#   CRYPTOPP_FOUND
-#     Indicates whether the library has been found.
-#
-#   CRYPTOPP_INCLUDE_DIRS
-#     Points to the CryptoPP include directory.
-#
-#   CRYPTOPP_LIBRARIES
-#     Points to the CryptoPP libraries that should be passed to
-#     target_link_libararies.
-#
-#
-# Copyright (c) 2012 Sergiu Dotenco
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-INCLUDE (FindPackageHandleStandardArgs)
-
-FIND_PATH (CRYPTOPP_ROOT_DIR
-  NAMES cryptopp/cryptlib.h include/cryptopp/cryptlib.h
-  PATHS ENV CRYPTOPPROOT
-  DOC "CryptoPP root directory")
-
-# Re-use the previous path:
-FIND_PATH (CRYPTOPP_INCLUDE_DIR
-  NAMES cryptopp/cryptlib.h
-  HINTS ${CRYPTOPP_ROOT_DIR}
-  PATH_SUFFIXES include
-  DOC "CryptoPP include directory")
-
-FIND_LIBRARY (CRYPTOPP_LIBRARY_DEBUG
-  NAMES cryptlibd cryptoppd
-  HINTS ${CRYPTOPP_ROOT_DIR}
-  PATH_SUFFIXES lib
-  DOC "CryptoPP debug library")
-
-FIND_LIBRARY (CRYPTOPP_LIBRARY_RELEASE
-  NAMES cryptlib cryptopp
-  HINTS ${CRYPTOPP_ROOT_DIR}
-  PATH_SUFFIXES lib
-  DOC "CryptoPP release library")
-
-IF (CRYPTOPP_LIBRARY_DEBUG AND CRYPTOPP_LIBRARY_RELEASE)
-  SET (CRYPTOPP_LIBRARY
-    optimized ${CRYPTOPP_LIBRARY_RELEASE}
-    debug ${CRYPTOPP_LIBRARY_DEBUG} CACHE DOC "CryptoPP library")
-ELSEIF (CRYPTOPP_LIBRARY_RELEASE)
-  SET (CRYPTOPP_LIBRARY ${CRYPTOPP_LIBRARY_RELEASE} CACHE DOC
-    "CryptoPP library")
-ENDIF (CRYPTOPP_LIBRARY_DEBUG AND CRYPTOPP_LIBRARY_RELEASE)
-
-IF (CRYPTOPP_INCLUDE_DIR)
-  SET (_CRYPTOPP_VERSION_HEADER ${CRYPTOPP_INCLUDE_DIR}/cryptopp/config.h)
-
-  IF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
-    FILE (STRINGS ${_CRYPTOPP_VERSION_HEADER} _CRYPTOPP_VERSION_TMP REGEX
-      "^#define CRYPTOPP_VERSION[ \t]+[0-9]+$")
-
-    STRING (REGEX REPLACE
-      "^#define CRYPTOPP_VERSION[ \t]+([0-9]+)" "\\1" _CRYPTOPP_VERSION_TMP
-      ${_CRYPTOPP_VERSION_TMP})
-
-    STRING (REGEX REPLACE "([0-9]+)[0-9][0-9]" "\\1" CRYPTOPP_VERSION_MAJOR
-      ${_CRYPTOPP_VERSION_TMP})
-    STRING (REGEX REPLACE "[0-9]([0-9])[0-9]" "\\1" CRYPTOPP_VERSION_MINOR
-      ${_CRYPTOPP_VERSION_TMP})
-    STRING (REGEX REPLACE "[0-9][0-9]([0-9])" "\\1" CRYPTOPP_VERSION_PATCH
-      ${_CRYPTOPP_VERSION_TMP})
-
-    SET (CRYPTOPP_VERSION_COUNT 3)
-    SET (CRYPTOPP_VERSION
-      ${CRYPTOPP_VERSION_MAJOR}.${CRYPTOPP_VERSION_MINOR}.${CRYPTOPP_VERSION_PATCH})
-  ENDIF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
-ENDIF (CRYPTOPP_INCLUDE_DIR)
-
-SET (CRYPTOPP_INCLUDE_DIRS ${CRYPTOPP_INCLUDE_DIR})
-SET (CRYPTOPP_LIBRARIES ${CRYPTOPP_LIBRARY})
-
-MARK_AS_ADVANCED (CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY CRYPTOPP_LIBRARY_DEBUG
-  CRYPTOPP_LIBRARY_RELEASE)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (CryptoPP REQUIRED_VARS 
-  CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY VERSION_VAR CRYPTOPP_VERSION)

cmake/FindGmp.cmake

@@ -1,34 +0,0 @@
-# Find gmp
-#
-# Find the gmp includes and library
-# 
-# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH 
-# 
-# This module defines
-#  GMP_INCLUDE_DIRS, where to find header, etc.
-#  GMP_LIBRARIES, the libraries needed to use gmp.
-#  GMP_FOUND, If false, do not try to use gmp.
-
-# only look in default directories
-find_path(
-	GMP_INCLUDE_DIR 
-	NAMES gmp.h
-	DOC "gmp include dir"
-)
-
-find_library(
-	GMP_LIBRARY
-	NAMES gmp
-	DOC "gmp library"
-)
-
-set(GMP_INCLUDE_DIRS ${GMP_INCLUDE_DIR})
-set(GMP_LIBRARIES ${GMP_LIBRARY})
-
-# handle the QUIETLY and REQUIRED arguments and set GMP_FOUND to TRUE
-# if all listed variables are TRUE, hide their existence from configuration view
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(gmp DEFAULT_MSG
-	GMP_INCLUDE_DIR GMP_LIBRARY)
-mark_as_advanced (GMP_INCLUDE_DIR GMP_LIBRARY)
-

cmake/FindJsonRpcCpp.cmake

@@ -1,99 +0,0 @@
-# Find json-rcp-cpp 
-#
-# Find the json-rpc-cpp includes and library
-# 
-# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH 
-# 
-# This module defines
-#  JSON_RCP_CPP_INCLUDE_DIRS, where to find header, etc.
-#  JSON_RCP_CPP_LIBRARIES, the libraries needed to use json-rpc-cpp.
-#  JSON_RPC_CPP_SERVER_LIBRARIES, the libraries needed to use json-rpc-cpp-server
-#  JSON_RPC_CPP_CLIENT_LIBRARIES, the libraries needed to use json-rpc-cpp-client
-#  JSON_RCP_CPP_FOUND, If false, do not try to use json-rpc-cpp.
-
-# only look in default directories
-find_path(
-	JSON_RPC_CPP_INCLUDE_DIR 
-	NAMES jsonrpccpp/server.h
-	PATH_SUFFIXES jsonrpc
-	DOC "json-rpc-cpp include dir"
-)
-
-find_library(
-	JSON_RPC_CPP_COMMON_LIBRARY
-	NAMES jsonrpccpp-common
-	DOC "json-rpc-cpp common library"
-)
-
-find_library(
-	JSON_RPC_CPP_SERVER_LIBRARY
-	NAMES jsonrpccpp-server
-	DOC "json-rpc-cpp server library"
-)
-
-find_library(
-	JSON_RPC_CPP_CLIENT_LIBRARY
-	NAMES jsonrpccpp-client
-	DOC "json-rpc-cpp client library"
-)
-
-# these are the variables to be uses by the calling script
-set (JSON_RPC_CPP_INCLUDE_DIRS ${JSON_RPC_CPP_INCLUDE_DIR})
-set (JSON_RPC_CPP_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_SERVER_LIBRARY} ${JSON_RPC_CPP_CLIENT_LIBRARY})
-set (JSON_RPC_CPP_SERVER_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_SERVER_LIBRARY})
-set (JSON_RPC_CPP_CLIENT_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_CLIENT_LIBRARY})
-
-# debug library on windows
-# same naming convention as in qt (appending debug library with d)
-# boost is using the same "hack" as us with "optimized" and "debug"
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-	find_library(
-		JSON_RPC_CPP_COMMON_LIBRARY_DEBUG
-		NAMES jsonrpccpp-commond
-		DOC "json-rpc-cpp common debug library"
-	)
-	
-	find_library(
-		JSON_RPC_CPP_SERVER_LIBRARY_DEBUG
-		NAMES jsonrpccpp-serverd
-		DOC "json-rpc-cpp server debug library"
-	)
-
-	find_library(
-		JSON_RPC_CPP_CLIENT_LIBRARY_DEBUG
-		NAMES jsonrpccpp-clientd
-		DOC "json-rpc-cpp client debug library"
-	)
-
-	set (JSON_RPC_CPP_LIBRARIES
-		optimized ${JSON_RPC_CPP_COMMON_LIBRARY}
-		optimized ${JSON_RPC_CPP_SERVER_LIBRARY}
-		optimized ${JSON_RPC_CPP_CLIENT_LIBRARY}
-		debug ${JSON_RPC_CPP_COMMON_LIBRARY_DEBUG}
-		debug ${JSON_RPC_CPP_SERVER_LIBRARY_DEBUG}
-		debug ${JSON_RPC_CPP_CLIENT_LIBRARY_DEBUG}
-	)
-	
-	set (JSON_RPC_CPP_SERVER_LIBRARIES
-		optimized ${JSON_RPC_CPP_COMMON_LIBRARY}
-		optimized ${JSON_RPC_CPP_SERVER_LIBRARY}
-		debug ${JSON_RPC_CPP_COMMON_LIBRARY_DEBUG}
-		debug ${JSON_RPC_CPP_SERVER_LIBRARY_DEBUG}
-	)
-
-	set (JSON_RPC_CPP_CLIENT_LIBRARIES
-		optimized ${JSON_RPC_CPP_COMMON_LIBRARY}
-		optimized ${JSON_RPC_CPP_CLIENT_LIBRARY}
-		debug ${JSON_RPC_CPP_COMMON_LIBRARY_DEBUG}
-		debug ${JSON_RPC_CPP_CLIENT_LIBRARY_DEBUG}
-	)
-
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set JSON_RPC_CPP_FOUND to TRUE
-# if all listed variables are TRUE, hide their existence from configuration view
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(json_rpc_cpp DEFAULT_MSG
-    JSON_RPC_CPP_COMMON_LIBRARY JSON_RPC_CPP_SERVER_LIBRARY JSON_RPC_CPP_CLIENT_LIBRARY JSON_RPC_CPP_INCLUDE_DIR)                             
-mark_as_advanced (JSON_RPC_CPP_COMMON_LIBRARY JSON_RPC_CPP_SERVER_LIBRARY JSON_RPC_CPP_CLIENT_LIBRARY JSON_RPC_CPP_INCLUDE_DIR)
-

cmake/FindJsoncpp.cmake

@@ -1,49 +0,0 @@
-# Find jsoncpp
-#
-# Find the jsoncpp includes and library
-# 
-# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH 
-# 
-# This module defines
-#  JSONCPP_INCLUDE_DIRS, where to find header, etc.
-#  JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
-#  JSONCPP_FOUND, If false, do not try to use jsoncpp.
-
-# only look in default directories
-find_path(
-	JSONCPP_INCLUDE_DIR 
-	NAMES json/json.h
-	PATH_SUFFIXES jsoncpp
-	DOC "jsoncpp include dir"
-)
-
-find_library(
-	JSONCPP_LIBRARY
-	NAMES jsoncpp
-	DOC "jsoncpp library"
-)
-
-set(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR})
-set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
-
-# debug library on windows
-# same naming convention as in qt (appending debug library with d)
-# boost is using the same "hack" as us with "optimized" and "debug"
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-	find_library(
-		JSONCPP_LIBRARY_DEBUG
-		NAMES jsoncppd
-		DOC "jsoncpp debug library"
-	)
-	
-	set(JSONCPP_LIBRARIES optimized ${JSONCPP_LIBRARIES} debug ${JSONCPP_LIBRARY_DEBUG})
-
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set JSONCPP_FOUND to TRUE
-# if all listed variables are TRUE, hide their existence from configuration view
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(jsoncpp DEFAULT_MSG
-	JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY)
-mark_as_advanced (JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY)
-

cmake/FindLevelDB.cmake

@@ -1,48 +0,0 @@
-# Find leveldb
-#
-# Find the leveldb includes and library
-# 
-# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH 
-# 
-# This module defines
-#  LEVELDB_INCLUDE_DIRS, where to find header, etc.
-#  LEVELDB_LIBRARIES, the libraries needed to use leveldb.
-#  LEVELDB_FOUND, If false, do not try to use leveldb.
-
-# only look in default directories
-find_path(
-	LEVELDB_INCLUDE_DIR 
-	NAMES leveldb/db.h
-	DOC "leveldb include dir"
-)
-
-find_library(
-	LEVELDB_LIBRARY
-	NAMES leveldb
-	DOC "leveldb library"
-)
-
-set(LEVELDB_INCLUDE_DIRS ${LEVELDB_INCLUDE_DIR})
-set(LEVELDB_LIBRARIES ${LEVELDB_LIBRARY})
-
-# debug library on windows
-# same naming convention as in qt (appending debug library with d)
-# boost is using the same "hack" as us with "optimized" and "debug"
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-	find_library(
-		LEVELDB_LIBRARY_DEBUG
-		NAMES leveldbd
-		DOC "leveldb debug library"
-	)
-	
-	set(LEVELDB_LIBRARIES optimized ${LEVELDB_LIBRARIES} debug ${LEVELDB_LIBRARY_DEBUG})
-
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set LEVELDB_FOUND to TRUE
-# if all listed variables are TRUE, hide their existence from configuration view
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(leveldb DEFAULT_MSG
-	LEVELDB_INCLUDE_DIR LEVELDB_LIBRARY)
-mark_as_advanced (LEVELDB_INCLUDE_DIR LEVELDB_LIBRARY)
-

cmake/FindMHD.cmake

@@ -1,47 +0,0 @@
-# Find microhttpd
-#
-# Find the microhttpd includes and library
-#
-# if you need to add a custom library search path, do it via via CMAKE_PREFIX_PATH
-#
-# This module defines
-#  MHD_INCLUDE_DIRS, where to find header, etc.
-#  MHD_LIBRARIES, the libraries needed to use jsoncpp.
-#  MHD_FOUND, If false, do not try to use jsoncpp.
-
-find_path(
-	MHD_INCLUDE_DIR
-	NAMES microhttpd.h
-	DOC "microhttpd include dir"
-)
-
-find_library(
-	MHD_LIBRARY
-	NAMES microhttpd microhttpd-10 libmicrohttpd libmicrohttpd-dll
-	DOC "microhttpd library"
-)
-
-set(MHD_INCLUDE_DIRS ${MHD_INCLUDE_DIR})
-set(MHD_LIBRARIES ${MHD_LIBRARY})
-
-# debug library on windows
-# same naming convention as in QT (appending debug library with d)
-# boost is using the same "hack" as us with "optimized" and "debug"
-# official MHD project actually uses _d suffix
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-	find_library(
-		MHD_LIBRARY_DEBUG
-		NAMES microhttpd_d microhttpd-10_d libmicrohttpd_d libmicrohttpd-dll_d
-		DOC "mhd debug library"
-	)
-
-	set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG})
-
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(mhd DEFAULT_MSG
-	MHD_INCLUDE_DIR MHD_LIBRARY)
-
-mark_as_advanced(MHD_INCLUDE_DIR MHD_LIBRARY)
-

cmake/FindMiniupnpc.cmake

@@ -1,34 +0,0 @@
-# Find miniupnpc
-#
-# Find the miniupnpc includes and library
-# 
-# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH 
-# 
-# This module defines
-#  MINIUPNPC_INCLUDE_DIRS, where to find header, etc.
-#  MINIUPNPC_LIBRARIES, the libraries needed to use gmp.
-#  MINIUPNPC_FOUND, If false, do not try to use gmp.
-
-# only look in default directories
-find_path(
-	MINIUPNPC_INCLUDE_DIR 
-	NAMES miniupnpc/miniupnpc.h
-	DOC "miniupnpc include dir"
-	)
-
-find_library(
-	MINIUPNPC_LIBRARY
-	NAMES miniupnpc
-	DOC "miniupnpc library"
-	)
-
-set(MINIUPNPC_INCLUDE_DIRS ${MINIUPNPC_INCLUDE_DIR})
-set(MINIUPNPC_LIBRARIES ${MINIUPNPC_LIBRARY})
-
-# handle the QUIETLY and REQUIRED arguments and set MINIUPNPC_FOUND to TRUE
-# if all listed variables are TRUE, hide their existence from configuration view
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(miniupnpc DEFAULT_MSG
-	MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY)
-mark_as_advanced (MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY)
-

cmake/FindReadline.cmake

@@ -1,34 +0,0 @@
-# Find readline
-#
-# Find the readline includes and library
-# 
-# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH 
-# 
-# This module defines
-#  READLINE_INCLUDE_DIRS, where to find header, etc.
-#  READLINE_LIBRARIES, the libraries needed to use readline.
-#  READLINE_FOUND, If false, do not try to use readline.
-
-# only look in default directories
-find_path(
-	READLINE_INCLUDE_DIR 
-	NAMES readline/readline.h
-	DOC "readling include dir"
-	)
-
-find_library(
-	READLINE_LIBRARY
-	NAMES readline
-	DOC "readline library"
-	)
-
-set(READLINE_INCLUDE_DIRS ${READLINE_INCLUDE_DIR})
-set(READLINE_LIBRARIES ${READLINE_LIBRARY})
-
-# handle the QUIETLY and REQUIRED arguments and set READLINE_FOUND to TRUE
-# if all listed variables are TRUE, hide their existence from configuration view
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(readline DEFAULT_MSG
-	READLINE_INCLUDE_DIR READLINE_LIBRARY)
-mark_as_advanced (READLINE_INCLUDE_DIR READLINE_LIBRARY)
-

cmake/scripts/buildinfo.cmake

@@ -1,48 +0,0 @@
-# generates BuildInfo.h
-# 
-# this module expects
-# ETH_SOURCE_DIR - main CMAKE_SOURCE_DIR
-# ETH_DST_DIR - main CMAKE_BINARY_DIR
-# ETH_BUILD_TYPE
-# ETH_BUILD_PLATFORM
-#
-# example usage:
-# cmake -DETH_SOURCE_DIR=. -DETH_DST_DIR=build -DETH_BUILD_TYPE=Debug -DETH_BUILD_PLATFORM=mac -P scripts/buildinfo.cmake
-
-if (NOT ETH_BUILD_TYPE)
-	set(ETH_BUILD_TYPE "unknown")
-endif()
-
-if (NOT ETH_BUILD_PLATFORM)
-	set(ETH_BUILD_PLATFORM "unknown")
-endif()
-
-execute_process(
-	COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} rev-parse HEAD
-	OUTPUT_VARIABLE ETH_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
-) 
-
-if (NOT ETH_COMMIT_HASH)
-	set(ETH_COMMIT_HASH 0)
-endif()
-
-execute_process(
-	COMMAND git --git-dir=${ETH_SOURCE_DIR}/.git --work-tree=${ETH_SOURCE_DIR} diff --shortstat	
-	OUTPUT_VARIABLE ETH_LOCAL_CHANGES OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
-)
-
-if (ETH_LOCAL_CHANGES)
-	set(ETH_CLEAN_REPO 0)
-else()
-	set(ETH_CLEAN_REPO 1)
-endif()
-
-set(INFILE "${ETH_SOURCE_DIR}/BuildInfo.h.in")
-set(TMPFILE "${ETH_DST_DIR}/BuildInfo.h.tmp")
-set(OUTFILE "${ETH_DST_DIR}/BuildInfo.h")
-
-configure_file("${INFILE}" "${TMPFILE}")
-
-include("${ETH_SOURCE_DIR}/cmake/EthUtils.cmake")
-replace_if_different("${TMPFILE}" "${OUTFILE}" CREATE)
-

cmake/scripts/configure.cmake

@@ -1,14 +0,0 @@
-# adds possibility to run configure_file as buildstep
-# reference: 
-# http://www.cmake.org/pipermail/cmake/2012-May/050227.html
-#
-# This module expects
-# INFILE
-# OUTFILE
-# other custom vars
-#
-# example usage:
-# cmake -DINFILE=blah.in -DOUTFILE=blah.out -Dvar1=value1 -Dvar2=value2 -P scripts/configure.cmake 
-
-configure_file(${INFILE} ${OUTFILE})
-

cmake/scripts/jsonrpcstub.cmake

@@ -1,45 +0,0 @@
-# generates JSONRPC Stub Server && Client
-#
-# this script expects
-# ETH_SOURCE_DIR - main CMAKE_SOURCE_DIR
-# ETH_SPEC_PATH
-# ETH_SERVER_DIR
-# ETH_CLIENT_DIR
-# ETH_SERVER_NAME
-# ETH_CLIENT_NAME
-# ETH_JSON_RPC_STUB
-# 
-# example usage:
-# cmake -DETH_SPEC_PATH=spec.json -DETH_SERVER_DIR=libweb3jsonrpc -DETH_CLIENT_DIR=test 
-# -DETH_SERVER_NAME=AbstractWebThreeStubServer -DETH_CLIENT_NAME=WebThreeStubClient -DETH_JSON_RPC_STUB=/usr/local/bin/jsonrpcstub
-
-# by default jsonrpcstub produces files in lowercase, we want to stick to this
-string(TOLOWER ${ETH_SERVER_NAME} ETH_SERVER_NAME_LOWER)
-string(TOLOWER ${ETH_CLIENT_NAME} ETH_CLIENT_NAME_LOWER)
-
-# setup names
-set(SERVER_TMPFILE "${ETH_SERVER_DIR}/${ETH_SERVER_NAME_LOWER}.h.tmp")
-set(SERVER_OUTFILE "${ETH_SERVER_DIR}/${ETH_SERVER_NAME_LOWER}.h")
-set(CLIENT_TMPFILE "${ETH_CLIENT_DIR}/${ETH_CLIENT_NAME_LOWER}.h.tmp")
-set(CLIENT_OUTFILE "${ETH_CLIENT_DIR}/${ETH_CLIENT_NAME_LOWER}.h")
-
-# create tmp files
-execute_process(
-	COMMAND ${ETH_JSON_RPC_STUB} ${ETH_SPEC_PATH} 
-		--cpp-server=${ETH_SERVER_NAME} --cpp-server-file=${SERVER_TMPFILE}
-		--cpp-client=${ETH_CLIENT_NAME} --cpp-client-file=${CLIENT_TMPFILE} 
-		OUTPUT_VARIABLE ERR ERROR_QUIET
-)
-
-# don't throw fatal error on jsonrpcstub error, someone might have old version of jsonrpcstub,
-# he does not need to upgrade it if he is not working on JSON RPC
-# show him warning instead
-if (ERR)
-	message(WARNING "Your version of jsonrcpstub tool is not supported. Please upgrade it.")
-	message(WARNING "${ERR}")
-else()
-	include("${ETH_SOURCE_DIR}/cmake/EthUtils.cmake")
-	replace_if_different("${SERVER_TMPFILE}" "${SERVER_OUTFILE}")
-	replace_if_different("${CLIENT_TMPFILE}" "${CLIENT_OUTFILE}")
-endif()
-

docker/Dockerfile

@@ -1,30 +0,0 @@
-FROM ubuntu:14.04
-
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update
-RUN apt-get upgrade -y
-
-# Ethereum dependencies
-RUN apt-get install -qy build-essential g++-4.8 git cmake libboost-all-dev libcurl4-openssl-dev wget
-RUN apt-get install -qy automake unzip libgmp-dev libtool libleveldb-dev yasm libminiupnpc-dev libreadline-dev scons
-RUN apt-get install -qy libjsoncpp-dev libargtable2-dev
-
-# NCurses based GUI (not optional though for a succesful compilation, see https://github.com/ethereum/cpp-ethereum/issues/452 )
-RUN apt-get install -qy libncurses5-dev
-
-# Qt-based GUI
-# RUN apt-get install -qy qtbase5-dev qt5-default qtdeclarative5-dev libqt5webkit5-dev
-
-# Ethereum PPA
-RUN apt-get install -qy software-properties-common
-RUN add-apt-repository ppa:ethereum/ethereum
-RUN apt-get update
-RUN apt-get install -qy libcryptopp-dev libjson-rpc-cpp-dev
-
-# Build Ethereum (HEADLESS)
-RUN git clone --depth=1 https://github.com/ethereum/cpp-ethereum
-RUN mkdir -p cpp-ethereum/build
-RUN cd cpp-ethereum/build && cmake .. -DCMAKE_BUILD_TYPE=Release -DHEADLESS=1 && make -j $(cat /proc/cpuinfo | grep processor | wc -l) && make install
-RUN ldconfig
-
-ENTRYPOINT ["/usr/local/bin/eth"]

docker/README.md

@@ -1,17 +0,0 @@
-# Dockerfile for cpp-ethereum
-Dockerfile to build a bleeding edge cpp-ethereum docker image from source
-
-    docker build -t cppeth < Dockerfile
-
-Run a simple peer server
-
-    docker run -i cppeth -m off -o peer -x 256
-
-GUI is compiled but not exposed. You can mount /cpp-ethereum/build to access binaries:
-
-    cid = $(docker run -i -v /cpp-ethereum/build cppeth -m off -o peer -x 256)
-    docker inspect $cid # <-- Find volume path in JSON output
-
-You may also modify the Docker image to run the GUI and expose a
-ssh/VNC server in order to tunnel an X11 or VNC session.
-

eth/CMakeLists.txt

@@ -1,32 +0,0 @@
-cmake_policy(SET CMP0015 NEW)
-set(CMAKE_AUTOMOC OFF)
-
-aux_source_directory(. SRC_LIST)
-
-include_directories(BEFORE ..)
-include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
-
-set(EXECUTABLE eth)
-
-file(GLOB HEADERS "*.h")
-
-add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-
-add_dependencies(${EXECUTABLE} BuildInfo.h)
-
-target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARIES})
-
-if (READLINE_FOUND)
-	target_link_libraries(${EXECUTABLE} ${READLINE_LIBRARIES})
-endif()
-
-if (JSONRPC)
-	target_link_libraries(${EXECUTABLE} web3jsonrpc)
-endif()
-
-target_link_libraries(${EXECUTABLE} webthree)
-target_link_libraries(${EXECUTABLE} secp256k1)
-
-install( TARGETS ${EXECUTABLE} DESTINATION bin )
-

eth/main.cpp

@@ -1,904 +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 main.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- * Ethereum client.
- */
-
-#include <thread>
-#include <chrono>
-#include <fstream>
-#include <iostream>
-#include <signal.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/trim_all.hpp>
-#include <libdevcrypto/FileSystem.h>
-#include <libevmcore/Instruction.h>
-#include <libevm/VM.h>
-#include <libevm/VMFactory.h>
-#include <libethereum/All.h>
-#include <libwebthree/WebThree.h>
-#if ETH_READLINE
-#include <readline/readline.h>
-#include <readline/history.h>
-#endif
-#if ETH_JSONRPC
-#include <libweb3jsonrpc/WebThreeStubServer.h>
-#include <jsonrpccpp/server/connectors/httpserver.h>
-#endif
-#include "BuildInfo.h"
-using namespace std;
-using namespace dev;
-using namespace dev::p2p;
-using namespace dev::eth;
-using namespace boost::algorithm;
-using dev::eth::Instruction;
-
-#undef RETURN
-
-bool isTrue(std::string const& _m)
-{
-	return _m == "on" || _m == "yes" || _m == "true" || _m == "1";
-}
-
-bool isFalse(std::string const& _m)
-{
-	return _m == "off" || _m == "no" || _m == "false" || _m == "0";
-}
-
-void interactiveHelp()
-{
-	cout
-		<< "Commands:" << endl
-		<< "    netstart <port>  Starts the network subsystem on a specific port." << endl
-		<< "    netstop  Stops the network subsystem." << endl
-		<< "    jsonstart <port>  Starts the JSON-RPC server." << endl
-		<< "    jsonstop  Stops the JSON-RPC server." << endl
-		<< "    connect <addr> <port>  Connects to a specific peer." << endl
-		<< "    verbosity (<level>)  Gets or sets verbosity level." << endl
-		<< "    minestart  Starts mining." << endl
-		<< "    minestop  Stops mining." << endl
-		<< "    mineforce <enable>  Forces mining, even when there are no transactions." << endl
-		<< "    address  Gives the current address." << endl
-		<< "    secret  Gives the current secret" << endl
-		<< "    block  Gives the current block height." << endl
-		<< "    balance  Gives the current balance." << endl
-		<< "    transact  Execute a given transaction." << endl
-		<< "    send  Execute a given transaction with current secret." << endl
-		<< "    contract  Create a new contract with current secret." << endl
-		<< "    peers  List the peers that are connected" << endl
-		<< "    listAccounts  List the accounts on the network." << endl
-		<< "    listContracts  List the contracts on the network." << endl
-		<< "    setSecret <secret>  Set the secret to the hex secret key." <<endl
-		<< "    setAddress <addr>  Set the coinbase (mining payout) address." <<endl
-		<< "    exportConfig <path>  Export the config (.RLP) to the path provided." <<endl
-		<< "    importConfig <path>  Import the config (.RLP) from the path provided." <<endl
-		<< "    inspect <contract>  Dumps a contract to <APPDATA>/<contract>.evm." << endl
-		<< "    dumptrace <block> <index> <filename> <format>  Dumps a transaction trace" << endl << "to <filename>. <format> should be one of pretty, standard, standard+." << endl
-		<< "    dumpreceipt <block> <index>  Dumps a transation receipt." << endl
-		<< "    exit  Exits the application." << endl;
-}
-
-void help()
-{
-	cout
-        << "Usage eth [OPTIONS] <remote-host>" << endl
-        << "Options:" << endl
-        << "    -a,--address <addr>  Set the coinbase (mining payout) address to addr (default: auto)." << endl
-		<< "    -b,--bootstrap  Connect to the default Ethereum peerserver." << endl
-        << "    -c,--client-name <name>  Add a name to your client's version string (default: blank)." << endl
-        << "    -d,--db-path <path>  Load database from path (default:  ~/.ethereum " << endl
-        << "                         <APPDATA>/Etherum or Library/Application Support/Ethereum)." << endl
-		<< "    -f,--force-mining  Mine even when there are no transaction to mine (Default: off)" << endl
-		<< "    -h,--help  Show this help message and exit." << endl
-        << "    -i,--interactive  Enter interactive mode (default: non-interactive)." << endl
-#if ETH_JSONRPC
-		<< "    -j,--json-rpc  Enable JSON-RPC server (default: off)." << endl
-		<< "    --json-rpc-port  Specify JSON-RPC server port (implies '-j', default: 8080)." << endl
-#endif
-        << "    -l,--listen <port>  Listen on the given port for incoming connected (default: 30303)." << endl
-		<< "    -m,--mining <on/off/number>  Enable mining, optionally for a specified number of blocks (Default: off)" << endl
-		<< "    -n,--upnp <on/off>  Use upnp for NAT (default: on)." << endl
-		<< "    -L,--local-networking Use peers whose addresses are local." << endl
-		<< "    -o,--mode <full/peer>  Start a full node or a peer node (Default: full)." << endl
-        << "    -p,--port <port>  Connect to remote port (default: 30303)." << endl
-        << "    -r,--remote <host>  Connect to remote host (default: none)." << endl
-        << "    -s,--secret <secretkeyhex>  Set the secret key for use with send command (default: auto)." << endl
-		<< "    -t,--miners <number>  Number of mining threads to start (Default: " << thread::hardware_concurrency() << ")" << endl
-        << "    -u,--public-ip <ip>  Force public ip to given (default; auto)." << endl
-        << "    -v,--verbosity <0 - 9>  Set the log verbosity from 0 to 9 (Default: 8)." << endl
-        << "    -x,--peers <number>  Attempt to connect to given number of peers (Default: 5)." << endl
-        << "    -V,--version  Show the version and exit." << endl
-#if ETH_EVMJIT
-		<< "    --jit  Use EVM JIT (default: off)." << endl
-#endif
-		;
-        exit(0);
-}
-
-string credits(bool _interactive = false)
-{
-	std::ostringstream cout;
-	cout
-		<< "Ethereum (++) " << dev::Version << endl
-		<< "  Code by Gav Wood, (c) 2013, 2014." << endl
-		<< "  Based on a design by Vitalik Buterin." << endl << endl;
-
-	if (_interactive)
-	{
-		cout << "Type 'netstart 30303' to start networking" << endl;
-		cout << "Type 'connect " << Host::pocHost() << " 30303' to connect" << endl;
-		cout << "Type 'exit' to quit" << endl << endl;
-	}
-	return cout.str();
-}
-
-void version()
-{
-	cout << "eth version " << dev::Version << endl;
-	cout << "Network protocol version: " << dev::eth::c_protocolVersion << endl;
-	cout << "Client database version: " << dev::eth::c_databaseVersion << endl;
-	cout << "Build: " << DEV_QUOTED(ETH_BUILD_PLATFORM) << "/" << DEV_QUOTED(ETH_BUILD_TYPE) << endl;
-	exit(0);
-}
-
-Address c_config = Address("ccdeac59d35627b7de09332e819d5159e7bb7250");
-string pretty(h160 _a, dev::eth::State _st)
-{
-	string ns;
-	h256 n;
-	if (h160 nameReg = (u160)_st.storage(c_config, 0))
-		n = _st.storage(nameReg, (u160)(_a));
-	if (n)
-	{
-		std::string s((char const*)n.data(), 32);
-		if (s.find_first_of('\0') != string::npos)
-			s.resize(s.find_first_of('\0'));
-		ns = " " + s;
-	}
-	return ns;
-}
-
-bool g_exit = false;
-
-void sighandler(int)
-{
-	g_exit = true;
-}
-
-enum class NodeMode
-{
-	PeerServer,
-	Full
-};
-
-int main(int argc, char** argv)
-{
-	unsigned short listenPort = 30303;
-	string remoteHost;
-	unsigned short remotePort = 30303;
-	string dbPath;
-	unsigned mining = ~(unsigned)0;
-	NodeMode mode = NodeMode::Full;
-	unsigned peers = 5;
-	int miners = -1;
-	bool interactive = false;
-#if ETH_JSONRPC
-	int jsonrpc = -1;
-#endif
-	string publicIP;
-	bool bootstrap = false;
-	bool upnp = true;
-	bool useLocal = false;
-	bool forceMining = false;
-	bool jit = false;
-	string clientName;
-
-	// Init defaults
-	Defaults::get();
-
-	// Our address.
-	KeyPair us = KeyPair::create();
-	Address coinbase = us.address();
-
-	string configFile = getDataDir() + "/config.rlp";
-	bytes b = contents(configFile);
-	if (b.size())
-	{
-		RLP config(b);
-		us = KeyPair(config[0].toHash<Secret>());
-		coinbase = config[1].toHash<Address>();
-	}
-	else
-	{
-		RLPStream config(2);
-		config << us.secret() << coinbase;
-		writeFile(configFile, config.out());
-	}
-
-	for (int i = 1; i < argc; ++i)
-	{
-		string arg = argv[i];
-		if ((arg == "-l" || arg == "--listen" || arg == "--listen-port") && i + 1 < argc)
-			listenPort = (short)atoi(argv[++i]);
-		else if ((arg == "-u" || arg == "--public-ip" || arg == "--public") && i + 1 < argc)
-			publicIP = argv[++i];
-		else if ((arg == "-r" || arg == "--remote") && i + 1 < argc)
-			remoteHost = argv[++i];
-		else if ((arg == "-p" || arg == "--port") && i + 1 < argc)
-			remotePort = (short)atoi(argv[++i]);
-		else if ((arg == "-n" || arg == "--upnp") && i + 1 < argc)
-		{
-			string m = argv[++i];
-			if (isTrue(m))
-				upnp = true;
-			else if (isFalse(m))
-				upnp = false;
-			else
-			{
-				cerr << "Invalid -n/--upnp option: " << m << endl;
-				return -1;
-			}
-		}
-		else if (arg == "-L" || arg == "--local-networking")
-			useLocal = true;
-		else if ((arg == "-c" || arg == "--client-name") && i + 1 < argc)
-			clientName = argv[++i];
-		else if ((arg == "-a" || arg == "--address" || arg == "--coinbase-address") && i + 1 < argc)
-		{
-			try
-			{
-				coinbase = h160(fromHex(argv[++i], ThrowType::Throw));
-			}
-			catch (BadHexCharacter& _e)
-			{
-				cwarn << "invalid hex character, coinbase rejected";
-				cwarn << boost::diagnostic_information(_e);
-				break;
-			}
-			catch (...)
-			{
-				cwarn << "coinbase rejected";
-				break;
-			}
-		}
-		else if ((arg == "-s" || arg == "--secret") && i + 1 < argc)
-			us = KeyPair(h256(fromHex(argv[++i])));
-		else if ((arg == "-d" || arg == "--path" || arg == "--db-path") && i + 1 < argc)
-			dbPath = argv[++i];
-		else if ((arg == "-m" || arg == "--mining") && i + 1 < argc)
-		{
-			string m = argv[++i];
-			if (isTrue(m))
-				mining = ~(unsigned)0;
-			else if (isFalse(m))
-				mining = 0;
-			else
-				try {
-					mining = stoi(m);
-				}
-				catch (...) {
-					cerr << "Unknown -m/--mining option: " << m << endl;
-					return -1;
-				}
-		}
-		else if (arg == "-b" || arg == "--bootstrap")
-			bootstrap = true;
-		else if (arg == "-f" || arg == "--force-mining")
-			forceMining = true;
-		else if (arg == "-i" || arg == "--interactive")
-			interactive = true;
-#if ETH_JSONRPC
-		else if ((arg == "-j" || arg == "--json-rpc"))
-			jsonrpc = jsonrpc == -1 ? 8080 : jsonrpc;
-		else if (arg == "--json-rpc-port" && i + 1 < argc)
-			jsonrpc = atoi(argv[++i]);
-#endif
-		else if ((arg == "-v" || arg == "--verbosity") && i + 1 < argc)
-			g_logVerbosity = atoi(argv[++i]);
-		else if ((arg == "-x" || arg == "--peers") && i + 1 < argc)
-			peers = atoi(argv[++i]);
-		else if ((arg == "-t" || arg == "--miners") && i + 1 < argc)
-			miners = atoi(argv[++i]);
-		else if ((arg == "-o" || arg == "--mode") && i + 1 < argc)
-		{
-			string m = argv[++i];
-			if (m == "full")
-				mode = NodeMode::Full;
-			else if (m == "peer")
-				mode = NodeMode::PeerServer;
-			else
-			{
-				cerr << "Unknown mode: " << m << endl;
-				return -1;
-			}
-		}
-		else if (arg == "--jit")
-		{
-#if ETH_EVMJIT
-			jit = true;
-#else
-			cerr << "EVM JIT not enabled" << endl;
-			return -1;
-#endif
-		}
-		else if (arg == "-h" || arg == "--help")
-			help();
-		else if (arg == "-V" || arg == "--version")
-			version();
-		else
-			remoteHost = argv[i];
-	}
-
-	if (!clientName.empty())
-		clientName += "/";
-
-	cout << credits();
-
-	VMFactory::setKind(jit ? VMKind::JIT : VMKind::Interpreter);
-	NetworkPreferences netPrefs(listenPort, publicIP, upnp, useLocal);
-	auto nodesState = contents((dbPath.size() ? dbPath : getDataDir()) + "/network.rlp");
-	dev::WebThreeDirect web3(
-		"Ethereum(++)/" + clientName + "v" + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) + (jit ? "/JIT" : ""),
-		dbPath,
-		false,
-		mode == NodeMode::Full ? set<string>{"eth", "shh"} : set<string>(),
-		netPrefs,
-		&nodesState,
-		miners
-		);
-	web3.setIdealPeerCount(peers);
-	eth::Client* c = mode == NodeMode::Full ? web3.ethereum() : nullptr;
-
-	if (c)
-	{
-		c->setForceMining(forceMining);
-		c->setAddress(coinbase);
-	}
-
-	cout << "Address: " << endl << toHex(us.address().asArray()) << endl;
-	web3.startNetwork();
-
-	if (bootstrap)
-		web3.connect(Host::pocHost());
-	if (remoteHost.size())
-		web3.connect(remoteHost, remotePort);
-
-#if ETH_JSONRPC
-	shared_ptr<WebThreeStubServer> jsonrpcServer;
-	unique_ptr<jsonrpc::AbstractServerConnector> jsonrpcConnector;
-	if (jsonrpc > -1)
-	{
-		jsonrpcConnector = unique_ptr<jsonrpc::AbstractServerConnector>(new jsonrpc::HttpServer(jsonrpc));
-		jsonrpcServer = shared_ptr<WebThreeStubServer>(new WebThreeStubServer(*jsonrpcConnector.get(), web3, vector<KeyPair>({us})));
-		jsonrpcServer->setIdentities({us});
-		jsonrpcServer->StartListening();
-	}
-#endif
-
-	signal(SIGABRT, &sighandler);
-	signal(SIGTERM, &sighandler);
-	signal(SIGINT, &sighandler);
-
-	if (interactive)
-	{
-		string logbuf;
-		string l;
-		while (!g_exit)
-		{
-			g_logPost = [](std::string const& a, char const*) { cout << "\r           \r" << a << endl << "Press Enter" << flush; };
-			cout << logbuf << "Press Enter" << flush;
-			std::getline(cin, l);
-			logbuf.clear();
-			g_logPost = [&](std::string const& a, char const*) { logbuf += a + "\n"; };
-
-#if ETH_READLINE
-			if (l.size())
-				add_history(l.c_str());
-			if (auto c = readline("> "))
-			{
-				l = c;
-				free(c);
-			}
-			else
-				break;
-#else
-			string l;
-			cout << "> " << flush;
-			std::getline(cin, l);
-#endif
-			istringstream iss(l);
-			string cmd;
-			iss >> cmd;
-			if (cmd == "netstart")
-			{
-				iss >> netPrefs.listenPort;
-				web3.setNetworkPreferences(netPrefs);
-				web3.startNetwork();
-			}
-			else if (cmd == "connect")
-			{
-				string addr;
-				unsigned port;
-				iss >> addr >> port;
-				web3.connect(addr, (short)port);
-			}
-			else if (cmd == "netstop")
-			{
-				web3.stopNetwork();
-			}
-			else if (c && cmd == "minestart")
-			{
-				c->startMining();
-			}
-			else if (c && cmd == "minestop")
-			{
-				c->stopMining();
-			}
-			else if (c && cmd == "mineforce")
-			{
-				string enable;
-				iss >> enable;
-				c->setForceMining(isTrue(enable));
-			}
-			else if (cmd == "verbosity")
-			{
-				if (iss.peek() != -1)
-					iss >> g_logVerbosity;
-				cout << "Verbosity: " << g_logVerbosity << endl;
-			}
-#if ETH_JSONRPC
-			else if (cmd == "jsonport")
-			{
-				if (iss.peek() != -1)
-					iss >> jsonrpc;
-				cout << "JSONRPC Port: " << jsonrpc << endl;
-			}
-			else if (cmd == "jsonstart")
-			{
-				if (jsonrpc < 0)
-					jsonrpc = 8080;
-				jsonrpcConnector = unique_ptr<jsonrpc::AbstractServerConnector>(new jsonrpc::HttpServer(jsonrpc));
-				jsonrpcServer = shared_ptr<WebThreeStubServer>(new WebThreeStubServer(*jsonrpcConnector.get(), web3, vector<KeyPair>({us})));
-				jsonrpcServer->setIdentities({us});
-				jsonrpcServer->StartListening();
-			}
-			else if (cmd == "jsonstop")
-			{
-				if (jsonrpcServer.get())
-					jsonrpcServer->StopListening();
-				jsonrpcServer.reset();
-			}
-#endif
-			else if (cmd == "address")
-			{
-				cout << "Current address:" << endl
-					 << toHex(us.address().asArray()) << endl;
-			}
-			else if (cmd == "secret")
-			{
-				cout << "Secret Key: " << toHex(us.secret().asArray()) << endl;
-			}
-			else if (c && cmd == "block")
-			{
-				cout << "Current block: " <<c->blockChain().details().number << endl;
-			}
-			else if (cmd == "peers")
-			{
-				for (auto it: web3.peers())
-					cout << it.host << ":" << it.port << ", " << it.clientVersion << ", "
-						<< std::chrono::duration_cast<std::chrono::milliseconds>(it.lastPing).count() << "ms"
-						<< endl;
-			}
-			else if (c && cmd == "balance")
-			{
-				cout << "Current balance: " << formatBalance( c->balanceAt(us.address())) << " = " <<c->balanceAt(us.address()) << " wei" << endl;
-			}
-			else if (c && cmd == "transact")
-			{
-				auto const& bc =c->blockChain();
-				auto h = bc.currentHash();
-				auto blockData = bc.block(h);
-				BlockInfo info(blockData);
-				if (iss.peek() != -1)
-				{
-					string hexAddr;
-					u256 amount;
-					u256 gasPrice;
-					u256 gas;
-					string sechex;
-					string sdata;
-
-					iss >> hexAddr >> amount >> gasPrice >> gas >> sechex >> sdata;
-					
-					cnote << "Data:";
-					cnote << sdata;
-					bytes data = dev::eth::parseData(sdata);
-					cnote << "Bytes:";
-					string sbd = asString(data);
-					bytes bbd = asBytes(sbd);
-					stringstream ssbd;
-					ssbd << bbd;
-					cnote << ssbd.str();
-					int ssize = sechex.length();
-					int size = hexAddr.length();
-					u256 minGas = (u256)Client::txGas(data, 0);
-					if (size < 40)
-					{
-						if (size > 0)
-							cwarn << "Invalid address length:" << size;
-					}
-					else if (gas < minGas)
-						cwarn << "Minimum gas amount is" << minGas;
-					else if (ssize < 40)
-					{
-						if (ssize > 0)
-							cwarn << "Invalid secret length:" << ssize;
-					}
-					else
-					{
-						try
-						{
-							Secret secret = h256(fromHex(sechex));
-							Address dest = h160(fromHex(hexAddr));
-							c->transact(secret, amount, dest, data, gas, gasPrice);
-						}
-						catch (BadHexCharacter& _e)
-						{
-							cwarn << "invalid hex character, transaction rejected";
-							cwarn << boost::diagnostic_information(_e);
-						}
-						catch (...)
-						{
-							cwarn << "transaction rejected";
-						}
-					}
-				}
-				else
-					cwarn << "Require parameters: transact ADDRESS AMOUNT GASPRICE GAS SECRET DATA";
-			}
-			else if (c && cmd == "listContracts")
-			{
-				auto acs =c->addresses();
-				string ss;
-				for (auto const& i: acs)
-					if ( c->codeAt(i, 0).size())
-					{
-						ss = toString(i) + " : " + toString( c->balanceAt(i)) + " [" + toString((unsigned) c->countAt(i)) + "]";
-						cout << ss << endl;
-					}
-			}
-			else if (c && cmd == "listAccounts")
-			{
-				auto acs =c->addresses();
-				string ss;
-				for (auto const& i: acs)
-					if ( c->codeAt(i, 0).empty())
-					{
-						ss = toString(i) + " : " + toString( c->balanceAt(i)) + " [" + toString((unsigned) c->countAt(i)) + "]";
-						cout << ss << endl;
-					}
-			}
-			else if (c && cmd == "send")
-			{
-				if (iss.peek() != -1)
-				{
-					string hexAddr;
-					u256 amount;
-					int size = hexAddr.length();
-
-					iss >> hexAddr >> amount;
-					if (size < 40)
-					{
-						if (size > 0)
-							cwarn << "Invalid address length:" << size;
-					}
-					else 
-					{
-						auto const& bc =c->blockChain();
-						auto h = bc.currentHash();
-						auto blockData = bc.block(h);
-						BlockInfo info(blockData);
-						u256 minGas = (u256)Client::txGas(bytes(), 0);
-						try
-						{
-							Address dest = h160(fromHex(hexAddr, ThrowType::Throw));
-							c->transact(us.secret(), amount, dest, bytes(), minGas);
-						}
-						catch (BadHexCharacter& _e)
-						{
-							cwarn << "invalid hex character, transaction rejected";
-							cwarn << boost::diagnostic_information(_e);
-						}
-						catch (...)
-						{
-							cwarn << "transaction rejected";
-						}
-					}
-				} 
-				else
-					cwarn << "Require parameters: send ADDRESS AMOUNT";
-			}
-			else if (c && cmd == "contract")
-			{
-				auto const& bc =c->blockChain();
-				auto h = bc.currentHash();
-				auto blockData = bc.block(h);
-				BlockInfo info(blockData);
-				if (iss.peek() != -1)
-				{
-					u256 endowment;
-					u256 gas;
-					u256 gasPrice;
-					string sinit;
-					iss >> endowment >> gasPrice >> gas >> sinit;
-					trim_all(sinit);
-					int size = sinit.length();
-					bytes init;
-					cnote << "Init:";
-					cnote << sinit;
-					cnote << "Code size:" << size;
-					if (size < 1)
-						cwarn << "No code submitted";
-					else
-					{
-						cnote << "Assembled:";
-						stringstream ssc;
-						try
-						{
-							init = fromHex(sinit, ThrowType::Throw);
-						}
-						catch (BadHexCharacter& _e)
-						{
-							cwarn << "invalid hex character, code rejected";
-							cwarn << boost::diagnostic_information(_e);
-							init = bytes();
-						}
-						catch (...)
-						{
-							cwarn << "code rejected";
-							init = bytes();
-						}
-						ssc.str(string());
-						ssc << disassemble(init);
-						cnote << "Init:";
-						cnote << ssc.str();
-					}
-					u256 minGas = (u256)Client::txGas(init, 0);
-					if (!init.size())
-						cwarn << "Contract creation aborted, no init code.";
-					else if (endowment < 0)
-						cwarn << "Invalid endowment";
-					else if (gas < minGas)
-						cwarn << "Minimum gas amount is" << minGas;
-					else
-						c->transact(us.secret(), endowment, init, gas, gasPrice);
-				} 
-				else
-					cwarn << "Require parameters: contract ENDOWMENT GASPRICE GAS CODEHEX";
-			}
-			else if (c && cmd == "dumpreceipt")
-			{
-				unsigned block;
-				unsigned index;
-				iss >> block >> index;
-				dev::eth::TransactionReceipt r = c->blockChain().receipts(c->blockChain().numberHash(block)).receipts[index];
-				auto rb = r.rlp();
-				cout << "RLP: " << RLP(rb) << endl;
-				cout << "Hex: " << toHex(rb) << endl;
-				cout << r << endl;
-			}
-			else if (c && cmd == "dumptrace")
-			{
-				unsigned block;
-				unsigned index;
-				string filename;
-				string format;
-				iss >> block >> index >> filename >> format;
-				ofstream f;
-				f.open(filename);
-
-				dev::eth::State state =c->state(index + 1,c->blockChain().numberHash(block));
-				if (index < state.pending().size())
-				{
-					Executive e(state, c->blockChain(), 0);
-					Transaction t = state.pending()[index];
-					state = state.fromPending(index);
-					bytes r = t.rlp();
-					try
-					{
-						e.setup(&r);
-
-						OnOpFunc oof;
-						if (format == "pretty")
-							oof = [&](uint64_t steps, Instruction instr, bigint newMemSize, bigint gasCost, dev::eth::VM* vvm, dev::eth::ExtVMFace const* vextVM)
-							{
-								dev::eth::VM* vm = vvm;
-								dev::eth::ExtVM const* ext = static_cast<ExtVM const*>(vextVM);
-								f << endl << "    STACK" << endl;
-								for (auto i: vm->stack())
-									f << (h256)i << endl;
-								f << "    MEMORY" << endl << dev::memDump(vm->memory());
-								f << "    STORAGE" << endl;
-								for (auto const& i: ext->state().storage(ext->myAddress))
-									f << showbase << hex << i.first << ": " << i.second << endl;
-								f << dec << ext->depth << " | " << ext->myAddress << " | #" << steps << " | " << hex << setw(4) << setfill('0') << vm->curPC() << " : " << dev::eth::instructionInfo(instr).name << " | " << dec << vm->gas() << " | -" << dec << gasCost << " | " << newMemSize << "x32";
-							};
-						else if (format == "standard")
-							oof = [&](uint64_t, Instruction instr, bigint, bigint, dev::eth::VM* vvm, dev::eth::ExtVMFace const* vextVM)
-							{
-								dev::eth::VM* vm = vvm;
-								dev::eth::ExtVM const* ext = static_cast<ExtVM const*>(vextVM);
-								f << ext->myAddress << " " << hex << toHex(dev::toCompactBigEndian(vm->curPC(), 1)) << " " << hex << toHex(dev::toCompactBigEndian((int)(byte)instr, 1)) << " " << hex << toHex(dev::toCompactBigEndian((uint64_t)vm->gas(), 1)) << endl;
-							};
-						else if (format == "standard+")
-							oof = [&](uint64_t, Instruction instr, bigint, bigint, dev::eth::VM* vvm, dev::eth::ExtVMFace const* vextVM)
-							{
-								dev::eth::VM* vm = vvm;
-								dev::eth::ExtVM const* ext = static_cast<ExtVM const*>(vextVM);
-								if (instr == Instruction::STOP || instr == Instruction::RETURN || instr == Instruction::SUICIDE)
-									for (auto const& i: ext->state().storage(ext->myAddress))
-										f << toHex(dev::toCompactBigEndian(i.first, 1)) << " " << toHex(dev::toCompactBigEndian(i.second, 1)) << endl;
-								f << ext->myAddress << " " << hex << toHex(dev::toCompactBigEndian(vm->curPC(), 1)) << " " << hex << toHex(dev::toCompactBigEndian((int)(byte)instr, 1)) << " " << hex << toHex(dev::toCompactBigEndian((uint64_t)vm->gas(), 1)) << endl;
-							};
-						e.go(oof);
-						e.finalize();
-					}
-					catch(Exception const& _e)
-					{
-						// TODO: a bit more information here. this is probably quite worrying as the transaction is already in the blockchain.
-						cwarn << diagnostic_information(_e);
-					}
-				}
-			}
-			else if (c && cmd == "inspect")
-			{
-				string rechex;
-				iss >> rechex;
-
-				if (rechex.length() != 40)
-					cwarn << "Invalid address length";
-				else
-				{
-					auto h = h160(fromHex(rechex));
-					stringstream s;
-
-					try
-					{
-						auto storage =c->storageAt(h, 0);
-						for (auto const& i: storage)
-							s << "@" << showbase << hex << i.first << "    " << showbase << hex << i.second << endl;
-						s << endl << disassemble( c->codeAt(h, 0)) << endl;
-
-						string outFile = getDataDir() + "/" + rechex + ".evm";
-						ofstream ofs;
-						ofs.open(outFile, ofstream::binary);
-						ofs.write(s.str().c_str(), s.str().length());
-						ofs.close();
-
-						cnote << "Saved" << rechex << "to" << outFile;
-					}
-					catch (dev::InvalidTrie)
-					{
-						cwarn << "Corrupted trie.";
-					}
-				}
-			}
-			else if (cmd == "setSecret")
-			{
-				if (iss.peek() != -1)
-				{
-					string hexSec;
-					iss >> hexSec;
-					us = KeyPair(h256(fromHex(hexSec)));
-				} 
-				else
-					cwarn << "Require parameter: setSecret HEXSECRETKEY";
-			}
-			else if (cmd == "setAddress")
-			{
-				if (iss.peek() != -1)
-				{
-					string hexAddr;
-					iss >> hexAddr;
-					if (hexAddr.length() != 40)
-						cwarn << "Invalid address length: " << hexAddr.length();
-					else
-					{
-						try
-						{
-							coinbase = h160(fromHex(hexAddr, ThrowType::Throw));
-						}
-						catch (BadHexCharacter& _e)
-						{
-							cwarn << "invalid hex character, coinbase rejected";
-							cwarn << boost::diagnostic_information(_e);
-						}
-						catch (...)
-						{
-							cwarn << "coinbase rejected";
-						}
-					}
-				}
-				else
-					cwarn << "Require parameter: setAddress HEXADDRESS";
-			}
-			else if (cmd == "exportConfig")
-			{
-				if (iss.peek() != -1)
-				{
-					string path;
-					iss >> path;
-					RLPStream config(2);
-					config << us.secret() << coinbase;
-					writeFile(path, config.out());
-				} 
-				else
-					cwarn << "Require parameter: exportConfig PATH";
-			}
-			else if (cmd == "importConfig")
-			{
-				if (iss.peek() != -1)
-				{
-					string path;
-					iss >> path;
-					bytes b = contents(path);
-					if (b.size())
-					{
-						RLP config(b);
-						us = KeyPair(config[0].toHash<Secret>());
-						coinbase = config[1].toHash<Address>();
-					} 
-					else
-						cwarn << path << "has no content!";
-				} 
-				else
-					cwarn << "Require parameter: importConfig PATH";
-			}
-			else if (cmd == "help")
-				interactiveHelp();
-			else if (cmd == "exit")
-				break;
-			else
-				cout << "Unrecognised command. Type 'help' for help in interactive mode." << endl;
-		}
-#if ETH_JSONRPC
-		if (jsonrpcServer.get())
-			jsonrpcServer->StopListening();
-#endif
-	}
-	else if (c)
-	{
-		unsigned n =c->blockChain().details().number;
-		if (mining)
-			c->startMining();
-		while (!g_exit)
-		{
-			if ( c->isMining() &&c->blockChain().details().number - n == mining)
-				c->stopMining();
-			this_thread::sleep_for(chrono::milliseconds(100));
-		}
-	}
-	else
-		while (!g_exit)
-			this_thread::sleep_for(chrono::milliseconds(1000));
-
-	writeFile((dbPath.size() ? dbPath : getDataDir()) + "/network.rlp", web3.saveNetwork());
-	return 0;
-}
-

evmcc/CMakeLists.txt

@@ -0,0 +1,18 @@
+set(TARGET_NAME evmcc)
+
+set(SOURCES
+	evmcc.cpp
+)
+source_group("" FILES ${SOURCES})
+
+add_executable(${TARGET_NAME} ${SOURCES})
+set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "tools")
+
+include_directories(../..)
+include_directories(${LLVM_INCLUDE_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
+
+target_link_libraries(${TARGET_NAME} ethereum)
+target_link_libraries(${TARGET_NAME} ${Boost_PROGRAM_OPTIONS_LIBRARIES})
+
+install(TARGETS ${TARGET_NAME} DESTINATION bin )

evmcc/evmcc.cpp

@@ -0,0 +1,210 @@
+
+#include <chrono>
+#include <iostream>
+#include <fstream>
+#include <ostream>
+#include <string>
+#include <vector>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/program_options.hpp>
+
+#include <llvm/Bitcode/ReaderWriter.h>
+#include <llvm/Support/raw_os_ostream.h>
+#include <llvm/Support/Signals.h>
+#include <llvm/Support/PrettyStackTrace.h>
+
+#include <libdevcore/Common.h>
+#include <libdevcore/CommonIO.h>
+#include <libevmcore/Instruction.h>
+#include <libevm/ExtVMFace.h>
+#include <evmjit/libevmjit/Compiler.h>
+#include <evmjit/libevmjit/ExecutionEngine.h>
+
+
+void parseProgramOptions(int _argc, char** _argv, boost::program_options::variables_map& _varMap)
+{
+	namespace opt = boost::program_options;
+
+	opt::options_description explicitOpts("Allowed options");
+	explicitOpts.add_options()
+		("help,h", "show usage information")
+		("compile,c", "compile the code to LLVM IR")
+		("interpret,i", "compile the code to LLVM IR and execute")
+		("gas,g", opt::value<size_t>(), "set initial gas for execution")
+		("disassemble,d", "dissassemble the code")
+		("dump-cfg", "dump control flow graph to graphviz file")
+		("dont-optimize", "turn off optimizations")
+		("optimize-stack", "optimize stack use between basic blocks (default: on)")
+		("rewrite-switch", "rewrite LLVM switch to branches (default: on)")
+		("output-ll", opt::value<std::string>(), "dump generated LLVM IR to file")
+		("output-bc", opt::value<std::string>(), "dump generated LLVM bitcode to file")
+		("show-logs", "output LOG statements to stderr")
+		("verbose,V", "enable verbose output");
+
+	opt::options_description implicitOpts("Input files");
+	implicitOpts.add_options()
+		("input-file", opt::value<std::string>(), "input file");
+
+	opt::options_description allOpts("");
+	allOpts.add(explicitOpts).add(implicitOpts);
+
+	opt::positional_options_description inputOpts;
+	inputOpts.add("input-file", 1);
+
+	const char* errorMsg = nullptr;
+	try
+	{
+		auto parser = opt::command_line_parser(_argc, _argv).options(allOpts).positional(inputOpts);
+		opt::store(parser.run(), _varMap);
+		opt::notify(_varMap);
+	}
+	catch (boost::program_options::error& err)
+	{
+		errorMsg = err.what();
+	}
+
+	if (!errorMsg && _varMap.count("input-file") == 0)
+		errorMsg = "missing input file name";
+
+	if (_varMap.count("disassemble") == 0
+		&& _varMap.count("compile") == 0
+		&& _varMap.count("interpret") == 0)
+	{
+		errorMsg = "at least one of -c, -i, -d is required";
+	}
+
+	if (errorMsg || _varMap.count("help"))
+	{
+		if (errorMsg)
+			std::cerr << "Error: " << errorMsg << std::endl;
+
+		std::cout << "Usage: " << _argv[0] << " <options> input-file " << std::endl
+				  << explicitOpts << std::endl;
+		std::exit(errorMsg ? 1 : 0);
+	}
+}
+
+int main(int argc, char** argv)
+{
+	llvm::sys::PrintStackTraceOnErrorSignal();
+	llvm::PrettyStackTraceProgram X(argc, argv);
+
+	boost::program_options::variables_map options;
+	parseProgramOptions(argc, argv, options);
+
+	auto inputFile = options["input-file"].as<std::string>();
+	std::ifstream ifs(inputFile);
+	if (!ifs.is_open())
+	{
+		std::cerr << "cannot open input file " << inputFile << std::endl;
+		exit(1);
+	}
+
+	std::string src((std::istreambuf_iterator<char>(ifs)),
+					(std::istreambuf_iterator<char>()));
+
+	boost::algorithm::trim(src);
+
+	using namespace dev;
+
+	bytes bytecode = fromHex(src);
+
+	if (options.count("disassemble"))
+	{
+		std::string assembly = eth::disassemble(bytecode);
+		std::cout << assembly << std::endl;
+	}
+
+	if (options.count("compile") || options.count("interpret"))
+	{
+		size_t initialGas = 10000;
+
+		if (options.count("gas"))
+			initialGas = options["gas"].as<size_t>();
+
+		auto compilationStartTime = std::chrono::high_resolution_clock::now();
+
+		eth::jit::Compiler::Options compilerOptions;
+		compilerOptions.dumpCFG = options.count("dump-cfg") > 0;
+		bool optimize = options.count("dont-optimize") == 0;
+		compilerOptions.optimizeStack = optimize || options.count("optimize-stack") > 0;
+		compilerOptions.rewriteSwitchToBranches = optimize || options.count("rewrite-switch") > 0;
+
+		auto compiler = eth::jit::Compiler(compilerOptions);
+		auto module = compiler.compile(bytecode, "main");
+
+		auto compilationEndTime = std::chrono::high_resolution_clock::now();
+
+		module->dump();
+
+		if (options.count("output-ll"))
+		{
+			auto outputFile = options["output-ll"].as<std::string>();
+			std::ofstream ofs(outputFile);
+			if (!ofs.is_open())
+			{
+				std::cerr << "cannot open output file " << outputFile << std::endl;
+				exit(1);
+			}
+			llvm::raw_os_ostream ros(ofs);
+			module->print(ros, nullptr);
+			ofs.close();
+		}
+
+		if (options.count("output-bc"))
+		{
+			auto outputFile = options["output-bc"].as<std::string>();
+			std::ofstream ofs(outputFile);
+			if (!ofs.is_open())
+			{
+				std::cerr << "cannot open output file " << outputFile << std::endl;
+				exit(1);
+			}
+			llvm::raw_os_ostream ros(ofs);
+			llvm::WriteBitcodeToFile(module.get(), ros);
+			ros.flush();
+			ofs.close();
+		}
+
+		if (options.count("verbose"))
+		{
+			std::cerr << "*** Compilation time: "
+					  << std::chrono::duration_cast<std::chrono::microseconds>(compilationEndTime - compilationStartTime).count()
+					  << std::endl;
+		}
+
+		if (options.count("interpret"))
+		{
+			using namespace eth::jit;
+
+			ExecutionEngine engine;
+			eth::jit::u256 gas = initialGas;
+
+			// Create random runtime data
+			RuntimeData data;
+			data.set(RuntimeData::Gas, gas);
+			data.set(RuntimeData::Address, (u160)Address(1122334455667788));
+			data.set(RuntimeData::Caller, (u160)Address(0xfacefacefaceface));
+			data.set(RuntimeData::Origin, (u160)Address(101010101010101010));
+			data.set(RuntimeData::CallValue, 0xabcd);
+			data.set(RuntimeData::CallDataSize, 3);
+			data.set(RuntimeData::GasPrice, 1003);
+			data.set(RuntimeData::CoinBase, (u160)Address(101010101010101015));
+			data.set(RuntimeData::TimeStamp, 1005);
+			data.set(RuntimeData::Number, 1006);
+			data.set(RuntimeData::Difficulty, 16);
+			data.set(RuntimeData::GasLimit, 1008);
+			data.set(RuntimeData::CodeSize, bytecode.size());
+			data.callData = (uint8_t*)"abc";
+			data.code = bytecode.data();
+
+			// BROKEN: env_* functions must be implemented & RuntimeData struct created
+			// TODO: Do not compile module again
+			auto result = engine.run(bytecode, &data, nullptr);
+			return static_cast<int>(result);
+		}
+	}
+
+	return 0;
+}

evmcc/test/arith/addmod.evm

@@ -0,0 +1 @@
+60646107b760271460005560006001f2

evmcc/test/arith/addmod.lll

@@ -0,0 +1,12 @@
+;; Should return (1975 + 39) `mod` 100  = 14 = 0x0e
+(asm
+100
+1975
+39
+ADDMOD
+0 
+MSTORE8 
+0
+1
+RETURN
+)

evmcc/test/arith/arith1.evm

@@ -0,0 +1 @@
+60016001900160070260050160029004600490066021900560150160030260059007600303600960110860005460086000f2

evmcc/test/arith/arith1.lll

@@ -0,0 +1,37 @@
+
+(asm 
+1
+1
+SWAP1
+ADD	;; 2
+7
+MUL	;; 14
+5
+ADD	;; 19
+2
+SWAP1
+DIV	;; 9
+4
+SWAP1
+MOD ;; 1
+33
+SWAP1
+SDIV;; 0
+21
+ADD	;; 21
+3
+MUL	;; 63
+5
+SWAP1
+SMOD;; 3
+3
+SUB ;; 0
+9
+17
+EXP ;; 17^9
+0
+MSTORE
+8
+0
+RETURN
+)

evmcc/test/arith/arith_bnot.evm

@@ -0,0 +1 @@
+6201e2406000546000530960005460206000f2

evmcc/test/arith/arith_bnot.lll

@@ -0,0 +1,14 @@
+
+(asm 
+123456
+0
+MSTORE
+0
+MLOAD
+BNOT
+0
+MSTORE
+32
+0
+RETURN
+)

evmcc/test/arith/div.evm

@@ -0,0 +1 @@
+60027ffedcba9876543210fedcba9876543210fedcba9876543210fedcba98765432100460005460206000f2

evmcc/test/arith/div.lll

@@ -0,0 +1,10 @@
+(asm 
+0x2
+0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210
+DIV
+0
+MSTORE
+32
+0
+RETURN 
+)

evmcc/test/arith/fib1.evm

@@ -0,0 +1 @@
+60016001818101818101818101818101818101818101818101818101818101818101818101818101818101818101818101818101818101

evmcc/test/arith/fib1.lll

@@ -0,0 +1,57 @@
+;; Fibbonacci unrolled
+
+(asm 
+1
+1
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+DUP2
+DUP2
+ADD
+)

evmcc/test/arith/mul.evm

@@ -0,0 +1 @@
+7001234567890abcdef0fedcba09876543217001234567890abcdef0fedcba09876543217001234567890abcdef0fedcba0987654321020260005460206000f2

evmcc/test/arith/mul.lll

@@ -0,0 +1,13 @@
+(asm 
+0x1234567890abcdef0fedcba0987654321
+0x1234567890abcdef0fedcba0987654321
+0x1234567890abcdef0fedcba0987654321
+MUL
+MUL
+0
+MSTORE
+32
+0
+RETURN 
+;; 47d0817e4167b1eb4f9fc722b133ef9d7d9a6fb4c2c1c442d000107a5e419561
+)

evmcc/test/arith/mulmod.evm

@@ -0,0 +1 @@
+6064601b60251560005560006001f2

evmcc/test/arith/mulmod.lll

@@ -0,0 +1,12 @@
+;; Should return (27 * 37) `mod` 100  = 99 = 0x63
+(asm
+100
+27
+37
+MULMOD
+0 
+MSTORE8 
+0
+1
+RETURN
+)

evmcc/test/except/badinst1.evm

@@ -0,0 +1 @@
+4a

evmcc/test/ext/calldatacopy1.evm

@@ -0,0 +1 @@
+60326000600a37600053600a6014f2

evmcc/test/ext/calldatacopy1.lll

@@ -0,0 +1,13 @@
+(asm
+50  ;; byte count
+0   ;; source index in calldata array
+10  ;; dest index in memory
+CALLDATACOPY
+
+0
+MLOAD ;; to dump memory
+
+10
+20
+RETURN
+)

evmcc/test/ext/calldatacopy2.evm

@@ -0,0 +1 @@
+606464e8d4a510006000376000536000600af2

evmcc/test/ext/calldatacopy2.lll

@@ -0,0 +1,13 @@
+(asm
+100           ;; byte count
+1000000000000 ;; source index in calldata array
+0             ;; dest index in memory
+CALLDATACOPY
+
+0
+MLOAD ;; to dump memory
+
+0
+10
+RETURN
+)

evmcc/test/ext/codecopy1.evm

@@ -0,0 +1 @@
+60146000600a39600053600a6014f2

evmcc/test/ext/codecopy1.lll

@@ -0,0 +1,13 @@
+(asm
+20  ;; byte count
+0   ;; source index in code array
+10  ;; dest index in memory
+CODECOPY
+
+0
+MLOAD ;; to dump memory
+
+10
+20
+RETURN
+)

evmcc/test/ext/codecopy2.evm

@@ -0,0 +1 @@
+606464e8d4a510006000396000536000600af2

evmcc/test/ext/codecopy2.lll

@@ -0,0 +1,13 @@
+(asm
+100           ;; byte count
+1000000000000 ;; source index in code array
+0             ;; dest index in memory
+CODECOPY
+
+0
+MLOAD ;; to dump memory
+
+0
+10
+RETURN
+)

evmcc/test/ext/codecopy3.evm

@@ -0,0 +1 @@
+3860006000396000536000600af2

evmcc/test/ext/codecopy3.lll

@@ -0,0 +1,13 @@
+(asm
+CODESIZE      ;; byte count
+0             ;; source index in code array
+0             ;; dest index in memory
+CODECOPY
+
+0
+MLOAD ;; to dump memory
+
+0
+10
+RETURN
+)

evmcc/test/ext/ext_test.evm

@@ -0,0 +1 @@
+5a3031333234363a4041424344455a36600035602635601335387f1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff600054602060006000f06020600060206000600030610bb8f1600053611000545b60200260002030ff60016002f2

evmcc/test/ext/ext_test.lll

@@ -0,0 +1,55 @@
+
+(asm 
+PC
+ADDRESS
+BALANCE
+CALLER
+ORIGIN
+CALLVALUE
+CALLDATASIZE
+GASPRICE
+PREVHASH
+COINBASE
+TIMESTAMP
+NUMBER
+DIFFICULTY
+GASLIMIT
+PC
+CALLDATASIZE
+0
+CALLDATALOAD
+38
+CALLDATALOAD
+19
+CALLDATALOAD
+CODESIZE
+0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff
+0
+MSTORE
+32
+0
+0
+CREATE
+32
+0
+32
+0
+0
+ADDRESS
+3000
+CALL
+0
+MLOAD
+4096
+MSTORE
+MSIZE
+32
+MUL
+0
+SHA3
+ADDRESS
+SUICIDE
+1
+2
+RETURN
+)

evmcc/test/ext/extcodecopy1.evm

@@ -0,0 +1 @@
+60c86000600a303c60005360006020f2

evmcc/test/ext/extcodecopy1.lll

@@ -0,0 +1,11 @@
+(asm
+200   ;; byte count
+0     ;; source index in code array
+10    ;; dest index in memory
+ADDRESS
+EXTCODECOPY
+
+0 MLOAD ;; to dump memory
+
+0 32 RETURN
+)

evmcc/test/ext/store_delete.evm

@@ -0,0 +1 @@
+6104d26063576000606357

evmcc/test/ext/store_delete.lll

@@ -0,0 +1,9 @@
+
+(asm 
+1234
+99
+SSTORE
+0
+99
+SSTORE
+)

evmcc/test/ext/store_test.evm

@@ -0,0 +1 @@
+607b607c60015760005760015660005603

evmcc/test/ext/store_test.lll

@@ -0,0 +1,14 @@
+
+(asm 
+123
+124
+1
+SSTORE
+0
+SSTORE
+1
+SLOAD
+0
+SLOAD
+SUB
+)

evmcc/test/jump/ackermann.ethel

@@ -0,0 +1,7 @@
+let A m n = 
+    if m == 0 then n+1
+    else if n == 0 then A (m-1) 1
+    else A (m-1) (A (m) (n-1))
+
+return A 3 8
+

evmcc/test/jump/ackermann.evm

@@ -0,0 +1 @@
+6009600360086012585d60005460206000f26000820e6047596000810e603859603460018303603084600185036012585d6012585d60445860436001830360016012585d604b5860018101905090509058

evmcc/test/jump/badindirect1.evm

@@ -0,0 +1 @@
+601b602502585d

evmcc/test/jump/badindirect1.lll

@@ -0,0 +1,9 @@
+;; Indirect jump out of code
+
+(asm
+27
+37
+MUL
+JUMP
+JUMPDEST
+)

evmcc/test/jump/badindirect2.evm

@@ -0,0 +1 @@
+60016003600302596000600058

evmcc/test/jump/badindirect2.lll

@@ -0,0 +1,12 @@
+;; Indirect jump into data
+
+(asm
+1          ;; 0
+3         
+3 
+MUL        ;; 6
+JUMPI      ;; 7
+0          ;; 8
+0          
+JUMP       
+)

evmcc/test/jump/badjump1.evm

@@ -0,0 +1 @@
+6103e758