Skip to content

Commit 2ba054f

Browse files
olehnikolaievolehnikolaiev
authored
Merge branch 'develop' into enhancement/SKALED-1900-release-build
2 parents 32e3309 + 5033d9f commit 2ba054f

19 files changed

+271
-192
lines changed

‎.github/workflows/build.yml

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build and test skale-consensus
22
on: [push]
33
jobs:
44
build:
5-
runs-on: ubuntu-20.04
5+
runs-on: ubuntu-22.04
66
steps:
77
- name: Cancel Previous Runs
88
uses: styfle/cancel-workflow-action@0.9.1
@@ -24,9 +24,9 @@ jobs:
2424
- name: Free disk space
2525
run: |
2626
sudo apt-get remove -yq cmake libjsoncpp-dev aria2 ansible azure-cli shellcheck rpm xorriso zsync \
27-
clang-6.0 lldb-6.0 lld-6.0 clang-format-6.0 clang-8 lldb-8 lld-8 clang-format-8 \
28-
clang-9 lldb-9 lld-9 clangd-9 clang-format-9 dotnet-sdk-3.0 dotnet-sdk-3.1=3.1.101-1 \
29-
esl-erlang firefox g++-8 g++-9 gfortran-8 gfortran-9 google-chrome-stable \
27+
clang-6.0 lldb-6.0 lld-6.0 clang-8 lldb-8 lld-8 \
28+
clang-9 lldb-9 lld-9 clangd-9 clang-format-14 dotnet-sdk-3.0 dotnet-sdk-3.1=3.1.101-1 \
29+
esl-erlang firefox g++-11 g++-11 gfortran-8 gfortran-9 google-chrome-stable \
3030
|| true >/dev/null 2>&1;
3131
3232
- name: Free more disk space
@@ -73,12 +73,18 @@ jobs:
7373
sudo rm -rf /usr/local/lib/android >/dev/null 2>&1
7474
sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1
7575
76+
- name: Install docker compose
77+
run: |
78+
mkdir -p ~/.docker/cli-plugins/
79+
curl -SL https://github.com/docker/compose/releases/download/v2.3.3/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
80+
chmod +x ~/.docker/cli-plugins/docker-compose
81+
docker compose version
82+
7683
- name: try docker compose
7784
run: |
78-
# cd sgxwallet/run_sgx_sim && docker-compose pull && docker-compose up -d
7985
cd sgxwallet/run_sgx_sim
8086
echo " --------------------------- stopping sgx wallet ------------------------------------------------------------------------------------------------------ "
81-
docker-compose down
87+
docker compose down
8288
echo " --------------------------- fixing sgx wallets docker config ----------------------------------------------------------------------------------------- "
8389
mv docker-compose.yml docker-compose.yml.old-previous || true
8490
echo "version: '3'" > docker-compose.yml
@@ -101,7 +107,7 @@ jobs:
101107
echo " restart: unless-stopped" >> docker-compose.yml
102108
echo " command: -s -y -V -d " >> docker-compose.yml
103109
echo " --------------------------- pulling sgx wallet ------------------------------------------------------------------------------------------------------- "
104-
docker-compose pull
110+
docker compose pull
105111
106112
- name: install cmake
107113
run: |
@@ -112,25 +118,24 @@ jobs:
112118
113119
- name: install packages
114120
run: |
115-
sudo apt-get -y install software-properties-common; sudo apt-add-repository universe; \
116-
sudo apt-get update; sudo apt-get -y install -y software-properties-common apt-utils libprocps-dev \
117-
gcc-9 g++-9 valgrind gawk sed libffi-dev ccache libgoogle-perftools-dev flex \
118-
bison yasm texinfo \
119-
autotools-dev autogen automake autoconf m4 shtool pkg-config sed gawk yasm nasm \
120-
python3 python3-pip \
121-
libtool build-essential \
122-
libgcrypt20-dev
121+
sudo apt-get update && \
122+
sudo apt-get install -y build-essential software-properties-common; sudo apt-get update; \
123+
sudo apt-add-repository universe; \
124+
sudo apt-get update; sudo apt-get install -y apt-utils libprocps-dev \
125+
gcc-11 g++-11 valgrind gawk sed libffi-dev ccache libunwind-dev libgoogle-perftools-dev yasm texinfo \
126+
autotools-dev autogen automake autoconf m4 shtool pkg-config gawk nasm unzip \
127+
python3 python3-pip libtool libgcrypt20-dev
123128
# python python-pip
124129
# python-is-python3
125130
126-
- name: Use g++-9 and gcov-9 by default
131+
- name: Use g++-11 and gcov-11 by default
127132
run: |
128133
echo "Updating all needed alternatives"
129-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
130-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
131-
sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 9
132-
sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-9 9
133-
sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-9 9
134+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11
135+
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11
136+
sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-11 11
137+
sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-11 11
138+
sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-11 11
134139
echo "Checking alternative for gcc"
135140
which gcc
136141
gcc --version
@@ -155,7 +160,7 @@ jobs:
155160
message("::set-output name=timestamp::${current_date}")
156161
157162
- name: ccache cache files
158-
uses: actions/cache@v1.1.0
163+
uses: actions/cache@v4.2.0
159164
with:
160165
path: .ccache
161166
key: ${ { matrix.config.name } }-ccache-${ { steps.ccache_cache_timestamp.outputs.timestamp } }
@@ -168,9 +173,6 @@ jobs:
168173
169174
- name: verify jsonrpc has been built
170175
run: ls libBLS/deps/deps_inst/x86_or_x64/include/jsonrpccpp/client.h
171-
172-
- name: workaround for HUNTER
173-
run: cd .. && mkdir -p "${HOME}"/.hunter/_Base/Download/crc32c/1.0.5/dc7fa8c/ && wget -O "${HOME}"/.hunter/_Base/Download/crc32c/1.0.5/dc7fa8c/hunter-1.0.5.tar.gz https://github.com/hunter-packages/crc32c/archive/refs/tags/hunter-1.0.5.tar.gz
174176

175177
- name: build consensus
176178
run: |

‎.github/workflows/dockerimage.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build consensust container
22
on: [push]
33
jobs:
44
build:
5-
runs-on: ubuntu-20.04
5+
runs-on: ubuntu-22.04
66
steps:
77

88
- name: Cancel Previous Runs
@@ -13,9 +13,9 @@ jobs:
1313
- name: Free disk space
1414
run: |
1515
sudo apt-get remove -yq cmake libjsoncpp-dev aria2 ansible azure-cli shellcheck rpm xorriso zsync \
16-
clang-6.0 lldb-6.0 lld-6.0 clang-format-6.0 clang-8 lldb-8 lld-8 clang-format-8 \
17-
clang-9 lldb-9 lld-9 clangd-9 clang-format-9 dotnet-sdk-3.0 dotnet-sdk-3.1=3.1.101-1 \
18-
esl-erlang firefox g++-8 g++-9 gfortran-8 gfortran-9 google-chrome-stable \
16+
clang-6.0 lldb-6.0 lld-6.0 clang-8 lldb-8 lld-8 \
17+
clang-9 lldb-9 lld-9 clangd-9 clang-format-14 dotnet-sdk-3.0 dotnet-sdk-3.1=3.1.101-1 \
18+
esl-erlang firefox g++-11 g++-11 gfortran-8 gfortran-9 google-chrome-stable \
1919
|| true >/dev/null 2>&1;
2020
2121
- name: Free more disk space
@@ -73,24 +73,23 @@ jobs:
7373
run: |
7474
sudo apt-get install -y software-properties-common; sudo apt-add-repository universe; \
7575
sudo apt-get update; sudo apt-get install -y software-properties-common apt-utils libprocps-dev \
76-
gcc-9 g++-9 valgrind gawk sed libffi-dev ccache libgoogle-perftools-dev flex \
77-
bison yasm texinfo \
78-
autotools-dev autogen automake autoconf m4 shtool pkg-config sed gawk yasm nasm \
76+
gcc-11 g++-11 valgrind gawk sed libffi-dev ccache libunwind-dev libgoogle-perftools-dev yasm texinfo \
77+
autotools-dev autogen automake autoconf m4 shtool pkg-config sed gawk yasm nasm unzip \
7978
python3 python3-pip python-is-python3 \
8079
libtool build-essential \
8180
libgcrypt20-dev
8281
# python python-pip
8382
# wget git libargtable2-dev \
8483
# libmicrohttpd-dev libhiredis-dev redis-server openssl libssl-dev >/dev/null 2>&1;
8584
86-
- name: Use g++-9 and gcov-9 by default
85+
- name: Use g++-11 and gcov-11 by default
8786
run: |
8887
echo "Updating all needed alternatives"
89-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
90-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
91-
sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 9
92-
sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-9 9
93-
sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-9 9
88+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11
89+
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11
90+
sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-11 11
91+
sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-11 11
92+
sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-11 11
9493
echo "Checking alternative for gcc"
9594
which gcc
9695
gcc --version
@@ -106,7 +105,7 @@ jobs:
106105
echo "Checking alternative for gcov-tool"
107106
which gcov-tool
108107
gcov-tool --version
109-
- uses: actions/checkout@v1
108+
- uses: actions/checkout@v2
110109
- name: submodule update
111110
run: git submodule update --init --recursive
112111
- name: Build the Docker image(GH)

‎.github/workflows/dockerimagebase.yml

Lines changed: 24 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5,89 +5,36 @@ on:
55
- build_base*
66
jobs:
77
build:
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-22.04
99
steps:
10-
- name: Free disk space
11-
run: |
12-
sudo apt-get remove -yq cmake libjsoncpp-dev aria2 ansible azure-cli shellcheck rpm xorriso zsync \
13-
clang-6.0 lldb-6.0 lld-6.0 clang-format-6.0 clang-8 lldb-8 lld-8 clang-format-8 \
14-
clang-9 lldb-9 lld-9 clangd-9 clang-format-9 dotnet-sdk-3.0 dotnet-sdk-3.1=3.1.101-1 \
15-
esl-erlang firefox g++-8 g++-9 gfortran-8 gfortran-9 google-chrome-stable \
16-
|| true >/dev/null 2>&1;
17-
18-
- name: Free more disk space
19-
run: |
20-
sudo apt-get remove -yq > \
21-
google-cloud-sdk ghc-8.0.2 ghc-8.2.2 ghc-8.4.4 ghc-8.6.2 ghc-8.6.3 ghc-8.6.4 \
22-
ghc-8.6.5 ghc-8.8.1 ghc-8.8.2 ghc-8.8.3 ghc-8.10.1 cabal-install-2.0 cabal-install-2.2 \
23-
cabal-install-2.4 cabal-install-3.0 cabal-install-3.2 heroku imagemagick \
24-
libmagickcore-dev libmagickwand-dev libmagic-dev ant ant-optional kubectl \
25-
mercurial apt-transport-https mono-complete mysql-client libmysqlclient-dev \
26-
mysql-server mssql-tools unixodbc-dev yarn bazel chrpath libssl-dev libxft-dev \
27-
libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev php7.1 php7.1-bcmath \
28-
php7.1-bz2 php7.1-cgi php7.1-cli php7.1-common php7.1-curl php7.1-dba php7.1-dev \
29-
php7.1-enchant php7.1-fpm php7.1-gd php7.1-gmp php7.1-imap php7.1-interbase php7.1-intl \
30-
php7.1-json php7.1-ldap php7.1-mbstring php7.1-mcrypt php7.1-mysql php7.1-odbc \
31-
php7.1-opcache php7.1-pgsql php7.1-phpdbg php7.1-pspell php7.1-readline php7.1-recode \
32-
php7.1-snmp php7.1-soap php7.1-sqlite3 php7.1-sybase php7.1-tidy php7.1-xml \
33-
php7.1-xmlrpc php7.1-xsl php7.1-zip php7.2 php7.2-bcmath php7.2-bz2 php7.2-cgi \
34-
php7.2-cli php7.2-common php7.2-curl php7.2-dba php7.2-dev php7.2-enchant php7.2-fpm \
35-
php7.2-gd php7.2-gmp php7.2-imap php7.2-interbase php7.2-intl php7.2-json php7.2-ldap \
36-
php7.2-mbstring php7.2-mysql php7.2-odbc php7.2-opcache php7.2-pgsql php7.2-phpdbg \
37-
php7.2-pspell php7.2-readline php7.2-recode php7.2-snmp php7.2-soap php7.2-sqlite3 \
38-
php7.2-sybase php7.2-tidy php7.2-xml php7.2-xmlrpc php7.2-xsl php7.2-zip php7.3 \
39-
php7.3-bcmath php7.3-bz2 php7.3-cgi php7.3-cli php7.3-common php7.3-curl php7.3-dba \
40-
php7.3-dev php7.3-enchant php7.3-fpm php7.3-gd php7.3-gmp php7.3-imap php7.3-interbase \
41-
php7.3-intl php7.3-json php7.3-ldap php7.3-mbstring php7.3-mysql php7.3-odbc \
42-
php7.3-opcache php7.3-pgsql php7.3-phpdbg php7.3-pspell php7.3-readline php7.3-recode \
43-
php7.3-snmp php7.3-soap php7.3-sqlite3 php7.3-sybase php7.3-tidy php7.3-xml \
44-
php7.3-xmlrpc php7.3-xsl php7.3-zip php7.4 php7.4-bcmath php7.4-bz2 php7.4-cgi \
45-
php7.4-cli php7.4-common php7.4-curl php7.4-dba php7.4-dev php7.4-enchant php7.4-fpm \
46-
php7.4-gd php7.4-gmp php7.4-imap php7.4-interbase php7.4-intl php7.4-json php7.4-ldap \
47-
php7.4-mbstring php7.4-mysql php7.4-odbc php7.4-opcache php7.4-pgsql php7.4-phpdbg \
48-
php7.4-pspell php7.4-readline php7.4-snmp php7.4-soap php7.4-sqlite3 php7.4-sybase \
49-
php7.4-tidy php7.4-xml php7.4-xmlrpc php7.4-xsl php7.4-zip php-amqp php-apcu \
50-
php-igbinary php-memcache php-memcached php-mongodb php-redis php-xdebug \
51-
php-zmq snmp pollinate libpq-dev postgresql-client powershell ruby-full \
52-
sphinxsearch subversion mongodb-org \
53-
|| true > /dev/null 2>&1;
54-
55-
- name: Cleanup
56-
run: |
57-
sudo apt-get autoremove -y >/dev/null 2>&1 && \
58-
sudo apt-get autoclean -y >/dev/null 2>&1 && \
59-
sudo rm -rf /usr/local/lib/android >/dev/null 2>&1 && \
60-
docker rmi $(docker image ls -aq) >/dev/null 2>&1
6110

6211
- name: install cmake
6312
run: |
64-
wget --no-check-certificate https://cmake.org/files/v3.10/cmake-3.10.0-Linux-x86_64.sh && \
65-
chmod +x cmake-3.10.0-Linux-x86_64.sh && \
66-
./cmake-3.10.0-Linux-x86_64.sh --skip-license --include-subdir && \
67-
sudo ln -sf `pwd`/cmake-3.10.0-Linux-x86_64/bin/* /usr/local/bin
13+
wget --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21.0-linux-x86_64.sh && \
14+
chmod +x cmake-3.21.0-linux-x86_64.sh && \
15+
./cmake-3.21.0-linux-x86_64.sh --skip-license --include-subdir && \
16+
sudo ln -sf `pwd`/cmake-3.21.0-linux-x86_64/bin/* /usr/local/bin
6817
6918
- name: install packages
7019
run: |
71-
sudo apt-get install -y software-properties-common; sudo apt-add-repository universe; \
72-
sudo apt-get update; sudo apt-get install -y software-properties-common apt-utils libprocps-dev \
73-
gcc-9 g++-9 valgrind gawk sed libffi-dev ccache libgoogle-perftools-dev flex \
74-
bison yasm texinfo \
75-
autotools-dev autogen automake autoconf m4 shtool pkg-config sed gawk yasm nasm \
20+
sudo apt-get update && \
21+
sudo apt-get install -y build-essential software-properties-common apt-utils libprocps-dev \
22+
gcc-11 g++-11 valgrind gawk sed libffi-dev ccache yasm texinfo \
23+
autotools-dev autogen automake autoconf m4 shtool pkg-config nasm \
7624
python3 python3-pip python-is-python3 \
77-
libtool build-essential \
78-
libgcrypt20-dev
25+
libtool libgcrypt20-dev
7926
# python python-pip
8027
# wget git libargtable2-dev \
81-
# libmicrohttpd-dev libhiredis-dev redis-server openssl libssl-dev >/dev/null 2>&1;
28+
# libmicrohttpd-dev libhiredis-dev redis-server openssl libssl-dev >/dev/null 2>&1;
8229
83-
- name: Use g++-9 and gcov-9 by default
30+
- name: Use g++-11 and gcov-11 by default
8431
run: |
8532
echo "Updating all needed alternatives"
86-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
87-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
88-
sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 9
89-
sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-9 9
90-
sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-9 9
33+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11
34+
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11
35+
sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-11 11
36+
sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-11 11
37+
sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-11 11
9138
echo "Checking alternative for gcc"
9239
which gcc
9340
gcc --version
@@ -104,16 +51,18 @@ jobs:
10451
which gcov-tool
10552
gcov-tool --version
10653
107-
- name: Login to docker
108-
env:
109-
GITHUB_TOKEN: ${{ secrets.DOCKER_SECRET }}
110-
run: docker login -u skalelabsci -p ${GITHUB_TOKEN}
111-
- uses: actions/checkout@v1
54+
- uses: actions/checkout@v2
11255
- name: submodule update
11356
run: git submodule update --init --recursive
11457

11558
- name: Build the Docker image(base)
11659
run: docker build . --file DockerfileBase --tag skalenetwork/consensust_base:latest
60+
61+
- name: Login to docker
62+
env:
63+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
64+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
65+
run: echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
11766

11867
- name: push docker image
11968
run: docker push skalenetwork/consensust_base:latest

‎CMakeLists.txt

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
cmake_minimum_required(VERSION 3.10)
22

3-
43
option(COVERAGE "Build with code coverage support" OFF)
54
if (COVERAGE)
65
message(STATUS "**********************")
@@ -21,12 +20,6 @@ if (NOT DEFINED DEPS_INSTALL_ROOT)
2120
endif ()
2221
message(INFO "---- DEPS_INSTALL_ROOT in consensus is: ${DEPS_INSTALL_ROOT}")
2322

24-
include("cmake/HunterGate.cmake")
25-
include("cmake/precompiledheader.cmake")
26-
27-
28-
HunterGate(URL "https://github.com/ruslo/hunter/archive/v0.23.76.tar.gz" SHA1 "c7b60993e841850e2c449afd454f5d5aa4ec04e4")
29-
3023
option( CONSENSUS_PROFILING "Build for profiling" OFF )
3124
if( SKALED_PROFILING )
3225
set( CONSENSUS_PROFILING ON )
@@ -63,20 +56,11 @@ include_directories("${DEPS_INSTALL_ROOT}/include" "${DEPS_INSTALL_ROOT}/include
6356
link_directories("${DEPS_INSTALL_ROOT}/lib")
6457
set(CMAKE_PREFIX_PATH "${DEPS_INSTALL_ROOT}")
6558

66-
# zeromq
67-
68-
69-
#find_package(оч CONFIG REQUIRED)
70-
71-
7259
#leveldb
73-
74-
hunter_add_package(leveldb)
7560
find_package(leveldb CONFIG REQUIRED)
7661

77-
78-
#set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-Wreturn-type -Winit-self")
79-
62+
find_package( Snappy CONFIG REQUIRED )
63+
find_package( Crc32c CONFIG REQUIRED )
8064

8165
set(CMAKE_CXX_STANDARD 17)
8266
execute_process( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/gcc_ver_query.sh OUTPUT_VARIABLE GXX_MAJOR_VERSION )
@@ -95,7 +79,6 @@ add_definitions("-DZMQ_NONBLOCKING")
9579

9680

9781
if (CMAKE_PROJECT_NAME STREQUAL "consensus")
98-
unset(SKALE_HAVE_BOOST_FROM_HUNTER)
9982
# to install compiler cache: sudo apt-get install ccache
10083
find_program(CCACHE_FOUND ccache)
10184
if (CCACHE_FOUND)
@@ -201,16 +184,7 @@ include_directories(. spdlog/include ${BLS_INCLUDE_DIRS} ${DEPS_INSTALL_ROOT}/in
201184
"${DEPS_INSTALL_ROOT}/include" ${CMAKE_BINARY_DIR}/deps/include)
202185

203186

204-
if (SKALE_HAVE_BOOST_FROM_HUNTER)
205-
set(BOOST_LIBS_4_CONSENSUS
206-
Boost::log Boost::thread Boost::system Boost::filesystem Boost::program_options
207-
)
208-
else ()
209-
set(BOOST_LIBS_4_CONSENSUS
210-
#boost_log
211-
boost_thread boost_system boost_filesystem boost_program_options
212-
)
213-
endif ()
187+
set(BOOST_LIBS_FOR_CONSENSUS boost_thread boost_system boost_filesystem boost_program_options)
214188

215189
set(DASH_D_SUFFIX "")
216190
if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
@@ -221,9 +195,11 @@ endif ()
221195
SET(LINK_LIBRARIES
222196
backtrace
223197
Threads::Threads
224-
${BOOST_LIBS_4_CONSENSUS}
198+
${BOOST_LIBS_FOR_CONSENSUS}
225199
${LIB_NAME_cryptopp}
226-
leveldb::leveldb
200+
leveldb
201+
snappy
202+
crc32c
227203
"${DEPS_INSTALL_ROOT}/lib/libjsonrpccpp-client.a"
228204
"${DEPS_INSTALL_ROOT}/lib/libjsonrpccpp-server.a"
229205
"${DEPS_INSTALL_ROOT}/lib/libmicrohttpd.a"

0 commit comments

Comments
 (0)