Move Farm to ethcore and rejig build to allow ethminer-only build.

CMakeLists.txt

@@ -32,6 +32,7 @@ option(USENPM "Use npm to recompile ethereum.js if it was changed" OFF)
 option(PROFILING "Build in support for profiling" OFF)
 
 set(BUNDLE "none" CACHE STRING "Predefined bundle of software to build (none, full, user, tests, minimal).")
+option(MINER "Build the miner component" ON)
 option(SOLIDITY "Build the Solidity language components" ON)
 option(SERPENT "Build the Serpent language components" ON)
 option(TOOLS "Build the tools components" ON)
@@ -187,6 +188,7 @@ eth_format_option(VMTRACE)
 eth_format_option(EVMJIT)
 eth_format_option(FATDB)
 eth_format_option(JSONRPC)
+eth_format_option(MINER)
 eth_format_option(USENPM)
 eth_format_option(PROFILING)
 eth_format_option(SOLIDITY)
@@ -249,6 +251,16 @@ elseif (BUNDLE STREQUAL "user")
 	set(NCURSES ${DECENT_PLATFORM})
 	set(TOOLS ON)
 	set(TESTS OFF)
+elseif (BUNDLE STREQUAL "miner")
+	set(SERPENT OFF)
+	set(SOLIDITY OFF)
+	set(USENPM OFF)
+	set(GUI OFF)
+	set(NCURSES OFF)
+	set(TOOLS OFF)
+	set(TESTS OFF)
+	set(MINER ON)
+	set(ETHASHCL ON)
 endif ()
 
 # Default CMAKE_BUILD_TYPE to "Release".
@@ -283,6 +295,7 @@ message("-- FATDB            Full database exploring                  ${FATDB}")
 message("-- JSONRPC          JSON-RPC support                         ${JSONRPC}")
 message("-- USENPM           Javascript source building               ${USENPM}")
 message("------------------------------------------------------------- components")
+message("-- MINER            Build miner                              ${MINER}")
 message("-- TOOLS            Build basic tools                        ${TOOLS}")
 message("-- SOLIDITY         Build Solidity language components       ${SOLIDITY}")
 message("-- SERPENT          Build Serpent language components        ${SERPENT}")
@@ -310,10 +323,20 @@ if (EVMJIT)
 	add_subdirectory(evmjit)
 endif()
 
+if (TOOLS OR GUI OR SOLIDITY OR NCURSES OR TESTS)
+	set(GENERAL 1)
+else ()
+	set(GENERAL 0)
+endif ()
+
+message("GENERAL ${GENERAL}")
+
 add_subdirectory(libdevcore)
-add_subdirectory(libevmcore)
-add_subdirectory(libevmasm)
-add_subdirectory(liblll)
+if (GENERAL)
+	add_subdirectory(libevmcore)
+	add_subdirectory(libevmasm)
+	add_subdirectory(liblll)
+endif ()
 
 if (SERPENT)
 	add_subdirectory(libserpent)
@@ -329,31 +352,43 @@ if (TOOLS)
 	if (SOLIDITY)
 		add_subdirectory(solc)
 	endif ()
-endif()
+endif ()
 
-if (JSONRPC)
+if (JSONRPC AND GENERAL)
 	add_subdirectory(libweb3jsonrpc)
-endif()
+endif ()
 
 if (JSCONSOLE)
 	add_subdirectory(libjsengine)
 	add_subdirectory(libjsconsole)
-endif()
+endif ()
 
 add_subdirectory(secp256k1)
-add_subdirectory(libp2p)
 add_subdirectory(libdevcrypto)
-add_subdirectory(libwhisper)
 
-add_subdirectory(libethash)
-if (ETHASHCL)
-	add_subdirectory(libethash-cl)
+if (GENERAL)
+	add_subdirectory(libp2p)
+	add_subdirectory(libwhisper)
+endif ()
+
+if (GENERAL OR MINER)
+	add_subdirectory(libethash)
+	if (ETHASHCL)
+		add_subdirectory(libethash-cl)
+	endif ()
 endif ()
 
 add_subdirectory(libethcore)
-add_subdirectory(libevm)
-add_subdirectory(libethereum)
-add_subdirectory(libwebthree)
+
+if (GENERAL)
+	add_subdirectory(libevm)
+	add_subdirectory(libethereum)
+	add_subdirectory(libwebthree)
+endif ()
+
+if (MINER)
+	add_subdirectory(ethminer)
+endif ()
 
 if (TESTS)
 	add_subdirectory(libtestutils)
@@ -367,7 +402,6 @@ if (TOOLS)
 
 	add_subdirectory(rlp)
 	add_subdirectory(abi)
-	add_subdirectory(ethminer)
 	add_subdirectory(eth)
 
 	if("x${CMAKE_BUILD_TYPE}" STREQUAL "xDebug")

ethminer/CMakeLists.txt

@@ -17,12 +17,7 @@ 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)
 	target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_CLIENT_LIBRARIES})
 	target_link_libraries(${EXECUTABLE} ${CURL_LIBRARIES})
 	if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)
@@ -30,7 +25,7 @@ if (JSONRPC)
 	endif()
 endif()
 
-target_link_libraries(${EXECUTABLE} webthree)
+target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} ethash)
 
 if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)

ethminer/main.cpp

@@ -32,12 +32,10 @@
 #include <libdevcrypto/FileSystem.h>
 #include <libevmcore/Instruction.h>
 #include <libdevcore/StructuredLogger.h>
+#include <libdevcrypto/SHA3.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/EthashAux.h>
-#include <libevm/VM.h>
-#include <libevm/VMFactory.h>
-#include <libethereum/All.h>
-#include <libwebthree/WebThree.h>
+#include <libethcore/Farm.h>
 #if ETH_JSONRPC || !ETH_TRUE
 #include <libweb3jsonrpc/WebThreeStubServer.h>
 #include <jsonrpccpp/server/connectors/httpserver.h>
@@ -50,7 +48,6 @@
 #endif
 using namespace std;
 using namespace dev;
-using namespace dev::p2p;
 using namespace dev::eth;
 using namespace boost::algorithm;
 using dev::eth::Instruction;
@@ -143,7 +140,7 @@ enum class MinerType
 
 void doBenchmark(MinerType _m, bool _phoneHome, unsigned _warmupDuration = 15, unsigned _trialDuration = 3, unsigned _trials = 5)
 {
-	BlockInfo genesis = CanonBlockChain::genesis();
+	BlockInfo genesis;
 	genesis.difficulty = 1 << 18;
 	cdebug << genesis.boundary();
 
@@ -294,9 +291,6 @@ void doFarm(MinerType _m, string const& _remote, unsigned _recheckPeriod)
 
 int main(int argc, char** argv)
 {
-	// Init defaults
-	Defaults::get();
-
 	/// Operating mode.
 	OperationMode mode = OperationMode::Farm;
 

exp/main.cpp

@@ -45,10 +45,10 @@
 #include <libdevcrypto/SecretStore.h>
 #include <libp2p/All.h>
 #include <libethcore/ProofOfWork.h>
+#include <libethcore/Farm.h>
 #include <libdevcrypto/FileSystem.h>
 #include <libethereum/All.h>
 #include <libethereum/KeyManager.h>
-#include <libethereum/Farm.h>
 #include <libethereum/AccountDiff.h>
 #include <libethereum/DownloadMan.h>
 #include <libethereum/Client.h>

libethcore/CMakeLists.txt

@@ -28,7 +28,7 @@ add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} ethash)
 target_link_libraries(${EXECUTABLE} devcrypto)
-target_link_libraries(${EXECUTABLE} evmcore)
+#target_link_libraries(${EXECUTABLE} evmcore)
 
 if (ETHASHCL)
 	target_link_libraries(${EXECUTABLE} ethash-cl)

libethereum/Client.h

@@ -37,12 +37,12 @@
 #include <libdevcore/Worker.h>
 #include <libethcore/Params.h>
 #include <libethcore/ABI.h>
+#include <libethcore/Farm.h>
 #include <libp2p/Common.h>
 #include "CanonBlockChain.h"
 #include "TransactionQueue.h"
 #include "State.h"
 #include "CommonNet.h"
-#include "Farm.h"
 #include "ClientBase.h"
 
 namespace dev