Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

SHA3IUF as git submodule

Browse source
This commit is contained in:
serkixenos 2022-06-28 17:52:11 +02:00
parent bac0642d4c
commit 7689d5adc0
8 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitmodules vendored
View file

@ -7,6 +7,7 @@
url = https://gitlab.com/PBSA/tools-libs/peerplays-fc.git
branch = latest-fc
ignore = dirty
[submodule "libraries/vendor/SHA3IUF/SHA3IUF"]
path = libraries/vendor/SHA3IUF/SHA3IUF
[submodule "libraries/vendor/SHA3IUF"]
path = libraries/vendor/SHA3IUF
url = https://github.com/brainhub/SHA3IUF.git
branch = master

6
libraries/plugins/peerplays_sidechain/CMakeLists.txt
View file

@ -6,7 +6,7 @@ add_library( peerplays_sidechain
sidechain_net_manager.cpp
sidechain_net_handler.cpp
sidechain_net_handler_bitcoin.cpp
sidechain_net_handler_eth.cpp
sidechain_net_handler_ethereum.cpp
sidechain_net_handler_hive.cpp
sidechain_net_handler_peerplays.cpp
bitcoin/bech32.cpp
@ -18,12 +18,12 @@ add_library( peerplays_sidechain
bitcoin/sign_bitcoin_transaction.cpp
common/rpc_client.cpp
common/utils.cpp
ethereum/transaction.cpp
ethereum/types.cpp
hive/asset.cpp
hive/operations.cpp
hive/transaction.cpp
hive/types.cpp
ethereum/transaction.cpp
ethereum/types.cpp
)
if (ENABLE_DEV_FEATURES)

0
libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_eth.hpp → libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp
View file

2
libraries/plugins/peerplays_sidechain/sidechain_net_handler_eth.cpp → libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
View file

@ -1,4 +1,4 @@
#include <graphene/peerplays_sidechain/sidechain_net_handler_eth.hpp>
#include <graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp>
#include <algorithm>
#include <thread>

4
libraries/plugins/peerplays_sidechain/sidechain_net_manager.cpp
View file

@ -3,7 +3,7 @@
#include <fc/log/logger.hpp>
#include <graphene/chain/son_wallet_object.hpp>
#include <graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp>
#include <graphene/peerplays_sidechain/sidechain_net_handler_eth.hpp>
#include <graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp>
#include <graphene/peerplays_sidechain/sidechain_net_handler_hive.hpp>
#include <graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp>
@ -33,7 +33,7 @@ bool sidechain_net_manager::create_handler(sidechain_type sidechain, const boost
break;
}
case sidechain_type::ethereum: {
std::unique_ptr<sidechain_net_handler> h = std::unique_ptr<sidechain_net_handler>(new sidechain_net_handler_eth(plugin, options));
std::unique_ptr<sidechain_net_handler> h = std::unique_ptr<sidechain_net_handler>(new sidechain_net_handler_ethereum(plugin, options));
net_handlers.push_back(std::move(h));
ret_val = true;
break;

27
libraries/vendor/CMakeLists.txt vendored
View file

@ -1 +1,26 @@
add_subdirectory( SHA3IUF )
PROJECT( SHA3IUF )
include(ExternalProject)
ExternalProject_Add(project_SHA3IUF
PREFIX ${CMAKE_CURRENT_BINARY_DIR}
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF
CONFIGURE_COMMAND cp -R ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF/. ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build
BUILD_COMMAND make
INSTALL_COMMAND true
BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}
LOG_BUILD ON
)
ExternalProject_Get_Property(project_SHA3IUF binary_dir)
add_library(SHA3IUF STATIC IMPORTED)
message(STATUS "Setting up SHA3IUF to ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}")
set_property(TARGET SHA3IUF PROPERTY IMPORTED_LOCATION ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX})
set_property(TARGET SHA3IUF PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF)
add_dependencies(SHA3IUF project_SHA3IUF)
install( FILES ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib )
set(SHA3IUF_libraries sha3 CACHE INTERNAL "")
set(SHA3IUF_include_dirs "${CMAKE_CURRENT_LIST_DIR}/SHA3IUF" CACHE INTERNAL "")
set(SHA3IUF_link_dirs "${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build" CACHE INTERNAL "")

0
libraries/vendor/SHA3IUF/SHA3IUF → libraries/vendor/SHA3IUF vendored
View file

26
libraries/vendor/SHA3IUF/CMakeLists.txt vendored
View file

@ -1,26 +0,0 @@
PROJECT( SHA3IUF )
include(ExternalProject)
ExternalProject_Add(project_SHA3IUF
PREFIX ${CMAKE_CURRENT_BINARY_DIR}
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF
CONFIGURE_COMMAND cp -R ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF/. ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build
BUILD_COMMAND make
INSTALL_COMMAND true
BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}
LOG_BUILD ON
)
ExternalProject_Get_Property(project_SHA3IUF binary_dir)
add_library(SHA3IUF STATIC IMPORTED)
message(STATUS "Setting up SHA3IUF to ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}")
set_property(TARGET SHA3IUF PROPERTY IMPORTED_LOCATION ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX})
set_property(TARGET SHA3IUF PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF)
add_dependencies(SHA3IUF project_SHA3IUF)
install( FILES ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib )
set(SHA3IUF_libraries sha3 CACHE INTERNAL "")
set(SHA3IUF_include_dirs "${CMAKE_CURRENT_LIST_DIR}/SHA3IUF" CACHE INTERNAL "")
set(SHA3IUF_link_dirs "${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build" CACHE INTERNAL "")