diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a2a07a7f2..5af8e547bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,8 @@ cable_configure_toolchain(DEFAULT cxx11) set(HUNTER_CONFIGURATION_TYPES Release CACHE STRING "Build type of Hunter packages") set(HUNTER_JOBS_NUMBER 6 CACHE STRING "Number of parallel builds used by Hunter") HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.23.112.tar.gz" - SHA1 "4b894e1d5d203f0cc9a77431dbb1b486ab6f4430" + URL "https://github.com/cpp-pm/hunter/archive/v0.23.300.tar.gz" + SHA1 "1151d539465d9cdbc880ee30f794864aec11c448" LOCAL ) @@ -68,7 +68,7 @@ hunter_add_package(jsoncpp) find_package(jsoncpp CONFIG REQUIRED) hunter_add_package(ethash) -find_package(ethash CONFIG REQUIRED) +find_package(ethash 0.6.0 CONFIG REQUIRED) configureProject() diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index 2b45ddb72e..2ae9f11082 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -1,2 +1,17 @@ -hunter_config(CURL VERSION ${HUNTER_CURL_VERSION} CMAKE_ARGS HTTP_ONLY=ON CMAKE_USE_OPENSSL=OFF CMAKE_USE_LIBSSH2=OFF CURL_CA_PATH=none) -hunter_config(Boost VERSION 1.66.0) +hunter_config( + CURL + VERSION ${HUNTER_CURL_VERSION} + CMAKE_ARGS HTTP_ONLY=ON CMAKE_USE_OPENSSL=OFF CMAKE_USE_LIBSSH2=OFF CURL_CA_PATH=none +) + +hunter_config( + Boost + VERSION 1.76.0 +) + +hunter_config( + ethash + VERSION 0.6.0 + SHA1 4bfa26b389d1f89a60053de04b2a29feab20f67b + URL https://github.com/chfast/ethash/archive/refs/tags/v0.6.0.tar.gz +) diff --git a/libapicore/ApiServer.h b/libapicore/ApiServer.h index 78fb81f8b5..fa89f4450b 100644 --- a/libapicore/ApiServer.h +++ b/libapicore/ApiServer.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/libethash-cl/kernels/Makefile b/libethash-cl/kernels/Makefile index 4b25440253..7c8c976082 100644 --- a/libethash-cl/kernels/Makefile +++ b/libethash-cl/kernels/Makefile @@ -5,8 +5,8 @@ ASFLAGS=-I$(SDIR) AS=clrxasm .PHONY: all -all: ellesmere tonga baffin gfx900 gfx901 gfx906 - @echo "Built ethash kernel for Ellesmere, Tonga, Baffin, Gfx900 and Gfx901 architectures." +all: ellesmere tonga baffin gfx900 gfx901 gfx902 gfx906 + @echo "Built ethash kernel for Ellesmere, Tonga, Baffin, Gfx900 Gfx901 Gfx902 and Gfx906 architectures." .PHONY: clean clean: @@ -38,6 +38,10 @@ gfx900: gfx900_lws64.bin gfx900_lws128.bin gfx900_lws256.bin gfx901: gfx901_lws64.bin gfx901_lws128.bin gfx901_lws256.bin @echo "Built gfx901 kernels..." +.PHONY: gfx902 +gfx902: gfx902_lws64.bin gfx902_lws128.bin gfx902_lws256.bin + @echo "Built gfx902 kernels..." + .PHONY: gfx906 gfx906: gfx906_lws64.bin gfx906_lws128.bin gfx906_lws256.bin @echo "Built gfx906 kernels..." diff --git a/libethash-cl/kernels/bin/ethash_gfx902_lws128.bin b/libethash-cl/kernels/bin/ethash_gfx902_lws128.bin new file mode 100644 index 0000000000..a70a931a0d Binary files /dev/null and b/libethash-cl/kernels/bin/ethash_gfx902_lws128.bin differ diff --git a/libethash-cl/kernels/bin/ethash_gfx902_lws128_exit.bin b/libethash-cl/kernels/bin/ethash_gfx902_lws128_exit.bin new file mode 100644 index 0000000000..5d7bbcbd4e Binary files /dev/null and b/libethash-cl/kernels/bin/ethash_gfx902_lws128_exit.bin differ diff --git a/libethash-cl/kernels/bin/ethash_gfx902_lws256.bin b/libethash-cl/kernels/bin/ethash_gfx902_lws256.bin new file mode 100644 index 0000000000..2ffbfa94f8 Binary files /dev/null and b/libethash-cl/kernels/bin/ethash_gfx902_lws256.bin differ diff --git a/libethash-cl/kernels/bin/ethash_gfx902_lws256_exit.bin b/libethash-cl/kernels/bin/ethash_gfx902_lws256_exit.bin new file mode 100644 index 0000000000..c4b107d5d9 Binary files /dev/null and b/libethash-cl/kernels/bin/ethash_gfx902_lws256_exit.bin differ diff --git a/libethash-cl/kernels/bin/ethash_gfx902_lws64.bin b/libethash-cl/kernels/bin/ethash_gfx902_lws64.bin new file mode 100644 index 0000000000..d5a29b7bb9 Binary files /dev/null and b/libethash-cl/kernels/bin/ethash_gfx902_lws64.bin differ diff --git a/libethash-cl/kernels/bin/ethash_gfx902_lws64_exit.bin b/libethash-cl/kernels/bin/ethash_gfx902_lws64_exit.bin new file mode 100644 index 0000000000..0f88c615ea Binary files /dev/null and b/libethash-cl/kernels/bin/ethash_gfx902_lws64_exit.bin differ diff --git a/libethash-cl/kernels/isa/GCN_ethash.isa b/libethash-cl/kernels/isa/GCN_ethash.isa index b674d735e7..54503a35b0 100644 --- a/libethash-cl/kernels/isa/GCN_ethash.isa +++ b/libethash-cl/kernels/isa/GCN_ethash.isa @@ -30,6 +30,10 @@ .driver_version 257000 .include "GCN_ethash_globaldata.isa" .include "GCN5_ethash_search.isa" +.elseifgpu gfx902 + .driver_version 257000 + .include "GCN_ethash_globaldata.isa" + .include "GCN5_ethash_search.isa" .elseifgpu gfx906 .driver_version 2906007 .include "GCN_ethash_globaldata.isa" diff --git a/libethcore/Farm.cpp b/libethcore/Farm.cpp index 92478cf646..047013304e 100644 --- a/libethcore/Farm.cpp +++ b/libethcore/Farm.cpp @@ -382,7 +382,7 @@ void Farm::restart() */ void Farm::restart_async() { - m_io_strand.get_io_service().post(m_io_strand.wrap(boost::bind(&Farm::restart, this))); + m_io_strand.context().post(m_io_strand.wrap(boost::bind(&Farm::restart, this))); } /** diff --git a/libethcore/Farm.h b/libethcore/Farm.h index 03b875aa38..00324d5924 100644 --- a/libethcore/Farm.h +++ b/libethcore/Farm.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/libpoolprotocols/getwork/EthGetworkClient.cpp b/libpoolprotocols/getwork/EthGetworkClient.cpp index 227f7b98eb..48d73a07f0 100644 --- a/libpoolprotocols/getwork/EthGetworkClient.cpp +++ b/libpoolprotocols/getwork/EthGetworkClient.cpp @@ -103,7 +103,7 @@ void EthGetworkClient::begin_connect() // Eventually endpoints get discarded on connection errors m_endpoint = m_endpoints.front(); m_socket.async_connect( - m_endpoint, m_io_strand.wrap(boost::bind(&EthGetworkClient::handle_connect, this, _1))); + m_endpoint, m_io_strand.wrap(boost::bind(&EthGetworkClient::handle_connect, this, boost::placeholders::_1))); } else { diff --git a/libpoolprotocols/stratum/EthStratumClient.cpp b/libpoolprotocols/stratum/EthStratumClient.cpp index 64721ade85..2753ad1a5f 100644 --- a/libpoolprotocols/stratum/EthStratumClient.cpp +++ b/libpoolprotocols/stratum/EthStratumClient.cpp @@ -344,12 +344,12 @@ void EthStratumClient::start_connect() if (m_conn->SecLevel() != SecureLevel::NONE) { m_securesocket->lowest_layer().async_connect(m_endpoint, - m_io_strand.wrap(boost::bind(&EthStratumClient::connect_handler, this, _1))); + m_io_strand.wrap(boost::bind(&EthStratumClient::connect_handler, this, boost::placeholders::_1))); } else { m_socket->async_connect(m_endpoint, - m_io_strand.wrap(boost::bind(&EthStratumClient::connect_handler, this, _1))); + m_io_strand.wrap(boost::bind(&EthStratumClient::connect_handler, this, boost::placeholders::_1))); } } else diff --git a/libpoolprotocols/stratum/EthStratumClient.h b/libpoolprotocols/stratum/EthStratumClient.h index fa599c7396..7e1197dd42 100644 --- a/libpoolprotocols/stratum/EthStratumClient.h +++ b/libpoolprotocols/stratum/EthStratumClient.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include