Use keccak from ethash

danieleftodi · May 10, 2018 · 4139bce · 4139bce
1 parent 0c8478b
commit 4139bce
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 269 deletions.
diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
@@ -34,7 +34,6 @@
 #include <boost/optional.hpp>
 
 #include <libethcore/Exceptions.h>
-#include <libdevcore/SHA3.h>
 #include <libethcore/EthashAux.h>
 #include <libethcore/Farm.h>
 #include <ethminer-buildinfo.h>

diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt
@@ -6,3 +6,4 @@ find_package(Threads)
 add_library(devcore ${SOURCES} ${HEADERS})
 target_link_libraries(devcore PUBLIC Boost::boost Boost::system)
 target_link_libraries(devcore PRIVATE Threads::Threads)
+
diff --git a/libdevcore/SHA3.cpp b/libdevcore/SHA3.cpp
diff --git a/libdevcore/SHA3.h b/libdevcore/SHA3.h
diff --git a/libethcore/BlockHeader.cpp b/libethcore/BlockHeader.cpp
@@ -3,11 +3,12 @@
 /// Licensed under GNU General Public License, Version 3. See the LICENSE file.
 
 #include "BlockHeader.h"
-#include "EthashAux.h"
+
 #include <libdevcore/Common.h>
-#include <libdevcore/Log.h>
 #include <libdevcore/RLP.h>
 
+#include <ethash/keccak.hpp>
+
 namespace dev
 {
 namespace eth
@@ -25,7 +26,9 @@ h256 const& BlockHeader::hashWithout() const
     {
         RLPStream s(BasicFields);
         streamRLPFields(s);
-        m_hashWithout = sha3(s.out());
+        const bytes& rlp = s.out();
+        auto hash = ethash::keccak256(rlp.data(), rlp.size());
+        m_hashWithout = h256{hash.bytes, h256::ConstructFromPointer};
     }
     return m_hashWithout;
 }

diff --git a/libethcore/BlockHeader.h b/libethcore/BlockHeader.h
@@ -8,7 +8,6 @@
 
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcore/SHA3.h>
 
 namespace dev
 {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ find_package(Threads)
		add_library(devcore ${SOURCES} ${HEADERS})
		target_link_libraries(devcore PUBLIC Boost::boost Boost::system)
		target_link_libraries(devcore PRIVATE Threads::Threads)