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

Merge branch 'bug/576-new-libbitoin-version' into 'develop'

Browse source 
#576 - new libbitcoin version

See merge request PBSA/peerplays!262
This commit is contained in:
Vlad Dobromyslov 2024-01-17 07:40:23 +00:00
commit c08bdb7a02
5 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1,4 +1,5 @@
# Defines Peerplays library target. # Defines Peerplays library target.
set(CMAKE_POLICY_DEFAULT_CMP0057 NEW)
project( Peerplays ) project( Peerplays )
cmake_minimum_required( VERSION 2.8.12 ) cmake_minimum_required( VERSION 2.8.12 )
@ -9,6 +10,9 @@ set( GUI_CLIENT_EXECUTABLE_NAME Peerplays )
set( CUSTOM_URL_SCHEME "gcs" ) set( CUSTOM_URL_SCHEME "gcs" )
set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" ) set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )
add_definitions("-DBOOST_ALLOW_DEPRECATED_HEADERS")
add_definitions("-DBOOST_BIND_GLOBAL_PLACEHOLDERS")
# http://stackoverflow.com/a/18369825 # http://stackoverflow.com/a/18369825
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)

13
Dockerfile
View file

@ -57,9 +57,9 @@ WORKDIR /home/peerplays/src
#=============================================================================== #===============================================================================
RUN \ RUN \
wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz && \ wget https://sourceforge.net/projects/boost/files/boost/1.73.0/boost_1_73_0.tar.gz && \
tar -xzf boost_1_72_0.tar.gz && \ tar -xzf boost_1_73_0.tar.gz && \
cd boost_1_72_0 && \ cd boost_1_73_0 && \
./bootstrap.sh && \ ./bootstrap.sh && \
./b2 install && \ ./b2 install && \
ldconfig && \ ldconfig && \
@ -134,8 +134,11 @@ RUN \
libsodium-dev libsodium-dev
RUN \ RUN \
git clone --branch version3.8.0 --depth 1 https://gitlab.com/PBSA/peerplays-1.0/libbitcoin-explorer.git && \ git clone https://github.com/libbitcoin/libbitcoin-build.git && \
cd libbitcoin-explorer && \ cd libbitcoin-build && \
git reset --hard 92c215fc1ffa272bab4d485d369d0306db52d69d && \
./generate3.sh && \
cd ../libbitcoin-explorer && \
./install.sh && \ ./install.sh && \
ldconfig && \ ldconfig && \
rm -rf /home/peerplays/src/* rm -rf /home/peerplays/src/*

13
Dockerfile.18.04
View file

@ -57,9 +57,9 @@ WORKDIR /home/peerplays/src
#=============================================================================== #===============================================================================
RUN \ RUN \
wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz && \ wget https://sourceforge.net/projects/boost/files/boost/1.73.0/boost_1_73_0.tar.gz && \
tar -xzf boost_1_72_0.tar.gz && \ tar -xzf boost_1_73_0.tar.gz && \
cd boost_1_72_0 && \ cd boost_1_73_0 && \
./bootstrap.sh && \ ./bootstrap.sh && \
./b2 install && \ ./b2 install && \
ldconfig && \ ldconfig && \
@ -134,8 +134,11 @@ RUN \
libsodium-dev libsodium-dev
RUN \ RUN \
git clone --branch version3.8.0 --depth 1 https://gitlab.com/PBSA/peerplays-1.0/libbitcoin-explorer.git && \ git clone https://github.com/libbitcoin/libbitcoin-build.git && \
cd libbitcoin-explorer && \ cd libbitcoin-build && \
git reset --hard 92c215fc1ffa272bab4d485d369d0306db52d69d && \
./generate3.sh && \
cd ../libbitcoin-explorer && \
./install.sh && \ ./install.sh && \
ldconfig && \ ldconfig && \
rm -rf /home/peerplays/src/* rm -rf /home/peerplays/src/*

13
README.md
View file

@ -22,9 +22,9 @@ sudo apt-get install \
Boost libraries setup: Boost libraries setup:
``` ```
wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz wget https://sourceforge.net/projects/boost/files/boost/1.73.0/boost_1_73_0.tar.gz
tar -xzf boost_1_72_0.tar.gz boost_1_72_0 tar -xzf boost_1_73_0.tar.gz boost_1_73_0
cd boost_1_72_0 cd boost_1_73_0
./bootstrap.sh ./bootstrap.sh
./b2 ./b2
sudo ./b2 install sudo ./b2 install
@ -77,8 +77,11 @@ sudo ldconfig
libbitcoin-explorer setup: libbitcoin-explorer setup:
``` ```
git clone --branch version3.8.0 --depth 1 https://gitlab.com/PBSA/peerplays-1.0/libbitcoin-explorer.git git clone https://github.com/libbitcoin/libbitcoin-build.git
cd libbitcoin-explorer cd libbitcoin-build
git reset --hard 92c215fc1ffa272bab4d485d369d0306db52d69d
./generate3.sh
cd ../libbitcoin-explorer
sudo ./install.sh sudo ./install.sh
sudo ldconfig sudo ldconfig
``` ```

2
libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp
View file

@ -3,6 +3,8 @@
#include <mutex> #include <mutex>
#include <vector> #include <vector>
#include <boost/bind.hpp>
using namespace boost::placeholders;
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <graphene/chain/proposal_object.hpp> #include <graphene/chain/proposal_object.hpp>