Merge branch 'develop' into p2p

alethzero/CMakeLists.txt

@@ -64,5 +64,5 @@ if (SERPENT)
 endif()
 
 # eth_install_executable is defined in cmake/EthExecutableHelper.cmake
-eth_install_executable(${EXECUTABLE} DLLS ${MHD_DLL_RELEASE})
+eth_install_executable(${EXECUTABLE} DLLS MHD_DLLS)
 

cmake/EthDependencies.cmake

@@ -4,7 +4,11 @@
 # 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}")
+if (CMAKE_CL_64)
+	set (ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extdep/install/${_system_name}/x64")
+else ()
+	set (ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extdep/install/${_system_name}/Win32")
+endif()
 set (CMAKE_PREFIX_PATH ${ETH_DEPENDENCY_INSTALL_DIR})
 
 # setup directory for cmake generated files and include it globally 
@@ -59,6 +63,7 @@ if (JSONRPC)
  	find_package(MHD) 
 	message(" - microhttpd header: ${MHD_INCLUDE_DIRS}")
 	message(" - microhttpd lib   : ${MHD_LIBRARIES}")
+	message(" - microhttpd dll   : ${MHD_DLLS}")
 endif() #JSONRPC
 
 # TODO readline package does not yet check for correct version number
@@ -104,7 +109,7 @@ endif()
 
 find_package (OpenCL)
 if (OpenCL_FOUND)
-	message(" - opencl header: ${OpenCL_INCLUDE_DIRES}")
+	message(" - opencl header: ${OpenCL_INCLUDE_DIRS}")
 	message(" - opencl lib   : ${OpenCL_LIBRARIES}")
 endif()
 

cmake/EthExecutableHelper.cmake

@@ -43,6 +43,22 @@ macro(eth_add_executable EXECUTABLE)
 
 endmacro()
 
+macro(eth_copy_dlls EXECUTABLE DLLS)
+	# dlls must be unsubstitud list variable (without ${}) in format
+	# optimized;path_to_dll.dll;debug;path_to_dlld.dll 
+	list(GET ${DLLS} 1 DLL_RELEASE)
+	list(GET ${DLLS} 3 DLL_DEBUG)
+	add_custom_command(TARGET ${EXECUTABLE}
+		POST_BUILD 
+		COMMAND ${CMAKE_COMMAND} ARGS 
+		-DDLL_RELEASE="${DLL_RELEASE}" 
+		-DDLL_DEBUG="${DLL_DEBUG}" 
+		-DCONF="$<CONFIGURATION>"
+		-DDESTINATION="${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" 
+		-P "${ETH_SCRIPTS_DIR}/copydlls.cmake"
+	)
+endmacro()
+
 # 
 # this function requires the following variables to be specified:
 # ETH_DEPENDENCY_INSTALL_DIR
@@ -107,10 +123,7 @@ macro(eth_install_executable EXECUTABLE)
 
 		#copy additional dlls
 		foreach(dll ${ETH_INSTALL_EXECUTABLE_DLLS})
-			add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
+			eth_copy_dlls(${EXECUTABLE} ${dll})
-			COMMAND ${CMAKE_COMMAND}
-			ARGS -E copy ${dll} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
-		)
 		endforeach(dll)
 
 		install( TARGETS ${EXECUTABLE} RUNTIME 

cmake/FindCURL.cmake

@@ -30,6 +30,7 @@ set(CURL_LIBRARIES ${CURL_LIBRARY})
 # 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

cmake/FindJsoncpp.cmake

@@ -30,6 +30,7 @@ set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
 # 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

cmake/FindLevelDB.cmake

@@ -29,6 +29,7 @@ set(LEVELDB_LIBRARIES ${LEVELDB_LIBRARY})
 # 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

cmake/FindMHD.cmake

@@ -30,18 +30,20 @@ set(MHD_LIBRARIES ${MHD_LIBRARY})
 # official MHD project actually uses _d suffix
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 
-	#TODO: place dlls into CMAKE_CFG_INTDIR subfolders
-	string(REPLACE ".lib" ".dll" MHD_DLL_RELEASE ${MHD_LIBRARY})
-	string(REPLACE "/lib/" "/bin/" MHD_DLL_RELEASE ${MHD_DLL_RELEASE})
-
 	find_library(
 		MHD_LIBRARY_DEBUG
 		NAMES microhttpd_d microhttpd-10_d libmicrohttpd_d libmicrohttpd-dll_d
 		DOC "mhd debug library"
 	)
-	# always use release for now
+
-	#string(REPLACE ".lib" ".dll" MHD_DLL_DEBUG ${MHD_LIBRARY_DEBUG})
+	set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG})
-	#set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG})
+
+    # prepare dlls
+	string(REPLACE ".lib" ".dll" MHD_DLL ${MHD_LIBRARY})
+	string(REPLACE "/lib/" "/bin/" MHD_DLL ${MHD_DLL})
+	string(REPLACE ".lib" ".dll" MHD_DLL_DEBUG ${MHD_LIBRARY_DEBUG})
+	string(REPLACE "/lib/" "/bin/" MHD_DLL_DEBUG ${MHD_DLL_DEBUG})
+	set(MHD_DLLS optimized ${MHD_DLL} debug ${MHD_DLL_DEBUG})
 
 endif()
 

cmake/Findjson_rpc_cpp.cmake

@@ -52,6 +52,7 @@ set (JSON_RPC_CPP_CLIENT_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP
 # 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

cmake/scripts/copydlls.cmake

@@ -0,0 +1,18 @@
+# this module expects
+# DLLS
+# CONF
+# DESTINATION
+
+# example usage:
+# cmake -DDLL_DEBUG=xd.dll -DDLL_RELEASE=x.dll -DCONFIGURATION=Release -DDESTINATION=dest -P scripts/copydlls.cmake
+
+# this script is created cause we do not know configuration in multiconfiguration generators at cmake configure phase ;)
+
+if ("${CONF}" STREQUAL "Release")
+    set(DLL ${DLL_RELEASE})
+else () # Debug
+    set(DLL ${DLL_DEBUG})
+endif()
+
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${DLL}" "${DESTINATION}")
+

eth/CMakeLists.txt

@@ -29,7 +29,7 @@ target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} ethash)
 
 if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)
-	add_custom_command(TARGET ${EXECUTABLE} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${MHD_DLL_RELEASE} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
+	eth_copy_dlls("${EXECUTABLE}" MHD_DLLS)
 endif()
 
 install( TARGETS ${EXECUTABLE} DESTINATION bin )

ethrpctest/CMakeLists.txt

@@ -28,7 +28,7 @@ target_link_libraries(${EXECUTABLE} testutils)
 target_link_libraries(${EXECUTABLE} web3jsonrpc)
 
 if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)
-	add_custom_command(TARGET ${EXECUTABLE} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${MHD_DLL_RELEASE} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
+	eth_copy_dlls("${EXECUTABLE}" MHD_DLLS)
 endif()
 
 install( TARGETS ${EXECUTABLE} DESTINATION bin )

extdep/CMakeLists.txt

@@ -34,23 +34,14 @@ if (ETH_COMPILE)
 	# boost
 	include(compile/boost.cmake)
 else()	
-	eth_download(jsoncpp)
+	eth_download(boost VERSION 1.55.0)
-	eth_download(microhttpd)
+	eth_download(cryptopp VERSION 5.6.2)
-	eth_download(json-rpc-cpp
+	eth_download(curl VERSION 7.4.2)
-		VERSION 4.2
+	eth_download(jsoncpp VERSION 1.6.2)
-		OSX_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/json-rpc-cpp_osx.sh
+	eth_download(json-rpc-cpp VERSION 0.5.0)
-	)
+	eth_download(leveldb VERSION 1.2)
-	
+	eth_download(microhttpd VERSION 0.9.2)
-	if (APPLE)
+	eth_download(qt VERSION 5.4.1)
-		eth_download(snappy OSX_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/snappy_osx.sh)
-	endif()
-
-	eth_download(leveldb OSX_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/leveldb_osx.sh)
-	eth_download(qt VERSION 5.4)
-	eth_download(cryptopp)
-	eth_download(boost)
-	eth_download(curl)
-
 endif()
 
 # will be re-eanbled later

extdep/getstuff.bat

@@ -0,0 +1,32 @@
+REM get stuff!
+if not exist download mkdir download 
+if not exist install mkdir install
+if not exist install\windows mkdir install\windows
+
+set eth_server=https://build.ethdev.com/builds/windows-precompiled
+
+call :download boost 1.55.0
+call :download cryptopp 5.6.2
+call :download curl 7.4.2
+call :download jsoncpp 1.6.2
+call :download json-rpc-cpp 0.5.0
+call :download leveldb 1.2
+call :download microhttpd 0.9.2
+call :download qt 5.4.1
+
+goto :EOF
+
+:download
+
+set eth_name=%1
+set eth_version=%2
+
+cd download
+
+if not exist %eth_name%-%eth_version%.tar.gz curl -o %eth_name%-%eth_version%.tar.gz %eth_server%/%eth_name%-%eth_version%.tar.gz
+if not exist %eth_name%-%eth_version% tar -zxvf %eth_name%-%eth_version%.tar.gz
+cmake -E copy_directory %eth_name%-%eth_version% ..\install\windows
+
+cd ..\download
+
+goto :EOF

libdevcore/Common.cpp

@@ -27,7 +27,7 @@ using namespace dev;
 namespace dev
 {
 
-char const* Version = "0.9.8";
+char const* Version = "0.9.9";
 
 }
 

libethash-cl/CMakeLists.txt

@@ -9,7 +9,7 @@ aux_source_directory(. SRC_LIST)
 file(GLOB HEADERS "*.h")
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${OpenCL_INCLUDE_DIRS}})
+include_directories(${OpenCL_INCLUDE_DIRS})
 include_directories(..)
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 TARGET_LINK_LIBRARIES(${EXECUTABLE} ${OpenCL_LIBRARIES} ethash)

libethcore/CMakeLists.txt

@@ -11,6 +11,11 @@ aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
+
+if (ETHASHCL)
+	include_directories(${OpenCL_INCLUDE_DIRS})
+endif ()
+
 if (CPUID_FOUND)
 	include_directories(${Cpuid_INCLUDE_DIRS})
 endif ()

libethereum/DownloadMan.h

@@ -134,6 +134,15 @@ public:
 		return m_blocksGot.full();
 	}
 
+	h256s remaining() const
+	{
+		h256s ret;
+		ReadGuard l(m_lock);
+		for (auto i: m_blocksGot.inverted())
+			ret.push_back(m_chain[i]);
+		return ret;
+	}
+
 	h256s chain() const { ReadGuard l(m_lock); return m_chain; }
 	void foreachSub(std::function<void(DownloadSub const&)> const& _f) const { ReadGuard l(x_subs); for(auto i: m_subs) _f(*i); }
 	unsigned subCount() const { ReadGuard l(x_subs); return m_subs.size(); }

libethereum/EthereumHost.cpp

@@ -132,9 +132,9 @@ void EthereumHost::noteDoneBlocks(EthereumPeer* _who, bool _clemency)
 		else
 		{
 			// Done our chain-get.
-			clog(NetNote) << "Chain download failed. Peer with blocks didn't have them all. This peer is bad and should be punished.";
+			clog(NetWarn) << "Chain download failed. Peer with blocks didn't have them all. This peer is bad and should be punished.";
-			clog(NetNote) << "TODO: PUNISH.";
+			clog(NetWarn) << m_man.remaining();
-
+			clog(NetWarn) << "WOULD BAN.";
 //			m_banned.insert(_who->session()->id());			// We know who you are!
 //			_who->disable("Peer sent hashes but was unable to provide the blocks.");
 		}

libp2p/NodeTable.cpp

@@ -483,7 +483,7 @@ void NodeTable::onReceived(UDPSocketFace*, bi::udp::endpoint const& _from, bytes
 				FindNode in = FindNode::fromBytesConstRef(_from, rlpBytes);
 
 				vector<shared_ptr<NodeEntry>> nearest = nearestNodeEntries(in.target);
-				static unsigned const nlimit = (m_socketPointer->maxDatagramSize - 13) / 87;
+				static unsigned const nlimit = (m_socketPointer->maxDatagramSize - 111) / 87;
 				for (unsigned offset = 0; offset < nearest.size(); offset += nlimit)
 				{
 					Neighbours out(_from, nearest, offset, nlimit);

test/net.cpp

@@ -223,6 +223,33 @@ BOOST_AUTO_TEST_CASE(v2PingNodePacket)
 	BOOST_REQUIRE(p.version == 2);
 }
 
+BOOST_AUTO_TEST_CASE(neighboursPacketLength)
+{
+	KeyPair k = KeyPair::create();
+	std::vector<std::pair<KeyPair,unsigned>> testNodes(TestNodeTable::createTestNodes(16));
+	bi::udp::endpoint to(boost::asio::ip::address::from_string("127.0.0.1"), 30000);
+	
+	// hash(32), signature(65), overhead: packet(2), type(1), nodeList(2), ts(9),
+	static unsigned const nlimit = (1280 - 111) / 87;
+	for (unsigned offset = 0; offset < testNodes.size(); offset += nlimit)
+	{
+		Neighbours out(to);
+		
+		auto limit = nlimit ? std::min(testNodes.size(), (size_t)(offset + nlimit)) : testNodes.size();
+		for (auto i = offset; i < limit; i++)
+		{
+			Neighbours::Node node;
+			node.ipAddress = boost::asio::ip::address::from_string("200.200.200.200").to_string();
+			node.port = testNodes[i].second;
+			node.node = testNodes[i].first.pub();
+			out.nodes.push_back(node);
+		}
+		
+		out.sign(k.sec());
+		BOOST_REQUIRE_LE(out.data.size(), 1280);
+	}
+}
+
 BOOST_AUTO_TEST_CASE(test_neighbours_packet)
 {
 	KeyPair k = KeyPair::create();

third/CMakeLists.txt

@@ -52,5 +52,5 @@ target_link_libraries(${EXECUTABLE} web3jsonrpc)
 target_link_libraries(${EXECUTABLE} jsqrc) 
 
 # eth_install_executable is defined in cmake/EthExecutableHelper.cmake
-eth_install_executable(${EXECUTABLE} DLLS ${MHD_DLL_RELEASE})
+eth_install_executable(${EXECUTABLE} DLLS MHD_DLLS)