Rename keccak library -> ethash library

CMakeLists.txt

@@ -164,8 +164,10 @@ endif()
 if(SILKWORM_WASM_API)
   add_compile_definitions(EVMC_LOADER_MOCK)
 endif()
+
 add_subdirectory(evmone/evmc)
-add_subdirectory(keccak)
+add_subdirectory(ethash)
+
 find_package(intx CONFIG REQUIRED)
 
 add_library(evmone evmone/lib/evmone/analysis.cpp
@@ -181,7 +183,7 @@ add_library(evmone evmone/lib/evmone/analysis.cpp
                    evmone/lib/evmone/opcodes_helpers.h)
 
 target_include_directories(evmone PUBLIC evmone/lib)
-target_link_libraries(evmone PUBLIC evmc intx::intx PRIVATE evmc::instructions keccak)
+target_link_libraries(evmone PUBLIC evmc intx::intx PRIVATE evmc::instructions ethash)
 
 if(MSVC)
   target_compile_options(evmone PRIVATE /EHsc)

core/CMakeLists.txt

@@ -29,7 +29,7 @@ list(FILTER SILKWORM_CORE_SRC EXCLUDE REGEX "_test\.cpp$")
 add_library(silkworm_core ${SILKWORM_CORE_SRC})
 target_include_directories(silkworm_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-set(SILKWORM_CORE_PUBLIC_LIBS evmc intx::intx keccak ff Microsoft.GSL::GSL nlohmann_json)
+set(SILKWORM_CORE_PUBLIC_LIBS evmc intx::intx ethash ff Microsoft.GSL::GSL nlohmann_json)
 set(SILKWORM_CORE_PRIVATE_LIBS evmone secp256k1 gmp)
 
 if(NOT SILKWORM_WASM_API)

ethash/CMakeLists.txt

@@ -0,0 +1,3 @@
+file(GLOB_RECURSE ETHASH_SRC CONFIGURE_DEPENDS "*.cpp" "*.hpp" "*.c" "*.h")
+add_library(ethash ${ETHASH_SRC})
+target_include_directories(ethash PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

ethash/ethash/hash_types.hpp

@@ -0,0 +1,48 @@
+// ethash: C/C++ implementation of Ethash, the Ethereum Proof of Work algorithm.
+// Copyright 2018-2019 Pawel Bylica.
+// Licensed under the Apache License, Version 2.0.
+
+// Modified by Andrea Lanfranchi for Silkworm 2021:
+// type aliasing removed
+
+// #pragma once
+#ifndef ETHASH_HASH_TYPES_HPP_
+#define ETHASH_HASH_TYPES_HPP_
+
+#include <stdint.h>
+
+namespace ethash {
+
+union hash256 {
+    uint64_t word64s[4];
+    uint32_t word32s[8];
+    uint8_t bytes[32];
+    char str[32];
+};
+
+union hash512 {
+    uint64_t word64s[8];
+    uint32_t word32s[16];
+    uint8_t bytes[64];
+    char str[64];
+};
+
+union hash1024 {
+    union hash512 hash512s[2];
+    uint64_t word64s[16];
+    uint32_t word32s[32];
+    uint8_t bytes[128];
+    char str[128];
+};
+
+union hash2048 {
+    union hash512 hash512s[4];
+    uint64_t word64s[32];
+    uint32_t word32s[64];
+    uint8_t bytes[256];
+    char str[256];
+};
+
+}  // namespace ethash
+
+#endif  // !ETHASH_HASH_TYPES_HPP_