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

Merge branch 'feature/son-for-ethereum' into feature/420-ethereum-unit-tests

Browse source
This commit is contained in:
Vlad Dobromyslov 2022-08-31 08:26:05 +03:00
commit 7bd338e0ec
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -51,7 +51,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
list(GET arg_list 0 output) list(GET arg_list 0 output)
message("Ubuntu version is: ${output}") message("Ubuntu version is: ${output}")
add_definitions(-DPEERPLAYS_UBUNTU_VERSION=${output}) add_definitions(-DPEERPLAYS_UBUNTU_VERSION=${output})
endif() endif()
# function to help with cUrl # function to help with cUrl

6
README.md
View file

@ -84,9 +84,9 @@ sudo apt-get install \
Install Boost libraries from source Install Boost libraries from source
``` ```
wget -c 'http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.bz2/download' -O boost_1_67_0.tar.bz2 wget -c 'https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2' -O boost_1_71_0.tar.bz2
tar xjf boost_1_67_0.tar.bz2 tar xjf boost_1_71_0.tar.bz2
cd boost_1_67_0/ cd boost_1_71_0/
./bootstrap.sh ./bootstrap.sh
sudo ./b2 install sudo ./b2 install
``` ```

12
libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
View file

@ -245,22 +245,14 @@ void peerplays_sidechain_plugin_impl::plugin_initialize(const boost::program_opt
} }
#ifdef ENABLE_PEERPLAYS_ASSET_DEPOSITS #ifdef ENABLE_PEERPLAYS_ASSET_DEPOSITS
sidechain_enabled_peerplays = true; //options.at("peerplays-sidechain-enabled").as<bool>(); sidechain_enabled_peerplays = true;
#else #else
sidechain_enabled_peerplays = false; sidechain_enabled_peerplays = false;
#endif #endif
config_ready_peerplays = true; config_ready_peerplays = true;
if (!config_ready_peerplays) { if (sidechain_enabled_peerplays && !config_ready_peerplays) {
wlog("Haven't set up Peerplays sidechain parameters"); wlog("Haven't set up Peerplays sidechain parameters");
} }
if (!(config_ready_bitcoin &&
config_ready_ethereum &&
config_ready_hive &&
config_ready_peerplays)) {
wlog("Haven't set up any sidechain parameters");
throw;
}
} }
void peerplays_sidechain_plugin_impl::plugin_startup() { void peerplays_sidechain_plugin_impl::plugin_startup() {