#35 -replace SHA3 openssl-version to SHA3 ethash-version for address …

…calculation

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "libraries/secp256k1"]
 	path = libraries/secp256k1
 	url = https://github.com/bitcoin-core/secp256k1
+[submodule "libraries/eth-crypto"]
+	path = libraries/eth-crypto
+	url = git@github.com:arrayio/eth-crypto.git

CMakeLists.txt

@@ -9,7 +9,7 @@ endif()
 
 add_subdirectory(./keychain_lib)
 add_subdirectory(./libraries/secp256k1_ext)
-add_subdirectory(./libraries/ethereum)
+add_subdirectory(./libraries/eth-crypto)
 add_subdirectory(./libraries/fc_light)
 
 if( MSVC )

keychain_cmd_app/CMakeLists.txt

@@ -32,7 +32,7 @@ if ( ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
             "../keychain_lib/include"
             "../keychain_linux/passentry_cmd"
             "../libraries/fc_light/include"
-            "../libraries/ethereum/include"
+            "../libraries/eth-crypto/include"
             "../libraries/secp256k1/include"
             "../libraries/secp256k1_ext/include"
             "${OPENSSL_ROOT_DIR}/include"
@@ -52,7 +52,7 @@ if ( ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
     find_library(LIB_XI NAME Xi HINTS "/usr/lib/x86_64-linux-gnu/")
     add_executable(keychain ${KEYCHAIN_SOURCES} ${KEYCHAIN_INCLUDE} )
     add_dependencies(keychain passentry_gui)
-    target_link_libraries(keychain keychain_common ${LIB_PTHREAD} fc_light ether ${LIB_OPENSSL} ${Boost_LIBRARIES} ${X11_LIBRARIES} ${LIB_XI})
+    target_link_libraries(keychain keychain_common ${LIB_PTHREAD} fc_light eth-crypto ${LIB_OPENSSL} ${Boost_LIBRARIES} ${X11_LIBRARIES} ${LIB_XI})
 
     set(GUI_BINARY ${CMAKE_BINARY_DIR}/keychain_linux/passentry_gui/passentry_gui)
     set(KEYCHAIN_BINARY_DIR ${CMAKE_BINARY_DIR}/keychain_cmd_app/passentry_gui)
@@ -65,7 +65,7 @@ else()
     include_directories(
             "../keychain_lib/include"
             "../libraries/fc_light/include"
-            "../libraries/ethereum/include"
+            "../libraries/eth-crypto/include"
             "../libraries/secp256k1/include"
             "../libraries/secp256k1_ext/include"
             "${OPENSSL_ROOT_DIR}/include"
@@ -74,6 +74,6 @@ else()
     file(GLOB KEYCHAIN_SOURCES "./*.cpp"  )
     file(GLOB KEYCHAIN_INCLUDE "./*.hpp"  )
     add_executable(keychain ${KEYCHAIN_SOURCES} ${KEYCHAIN_INCLUDE} )
-    target_link_libraries(keychain keychain_common fc_light ether ${LIB_OPENSSL} ${Boost_LIBRARIES})
+    target_link_libraries(keychain keychain_common fc_light eth-crypto ${LIB_OPENSSL} ${Boost_LIBRARIES})
 
 endif()

keychain_lib/CMakeLists.txt

@@ -27,7 +27,7 @@ if( MSVC )
             "../libraries/fc_light/include"
             "../libraries/secp256k1/include"
             "../libraries/secp256k1_ext/include"
-            "../libraries/ethereum/include"
+            "../libraries/eth-crypto/include"
             "${OPENSSL_ROOT_DIR}/include"
             ${Boost_INCLUDE_DIR})
 else ( MSVC )
@@ -36,7 +36,7 @@ else ( MSVC )
             "../libraries/fc_light/include"
             "../libraries/secp256k1/include"
             "../libraries/secp256k1_ext/include"
-            "../libraries/ethereum/include"
+            "../libraries/eth-crypto/include"
             "${OPENSSL_ROOT_DIR}/include"
             "/usr/include/libcxxabi"
             ${Boost_INCLUDE_DIR})

keychain_lib/include/keychain_lib/keychain_commands.hpp

@@ -27,8 +27,8 @@
 #include "key_file_parser.hpp"
 #include "key_encryptor.hpp"
 #include "sign_define.hpp"
-#include <ethereum/core/FixedHash.h>
-#include <ethereum/crypto/Common.h>
+#include <eth-crypto/core/FixedHash.h>
+#include <eth-crypto/crypto/Common.h>
 #include <secp256k1_ext.hpp>
 
 #include <openssl/sha.h>