Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/try alt linking btc 313 #30

Closed
wants to merge 14 commits into from
Closed

Feature/try alt linking btc 313 #30

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9907b6e
Fix (#29)
Warchant Mar 17, 2020
01cf37c
Try linking
Mar 27, 2020
63b9e28
Add configure without pkg-config
Mar 27, 2020
7b9e913
Sample alt-integration
Apr 2, 2020
c693ee8
alt-integration lib
Mar 29, 2020
8e38583
Try linux
Apr 3, 2020
c8b3854
Build alt-integration library
Apr 3, 2020
922ad39
Windows version
Apr 3, 2020
9daef98
Cleanup
Apr 3, 2020
1323d8e
Cleanup
Apr 3, 2020
3c398c5
Cleanup
Apr 4, 2020
4c1f1fd
Cleanup
Apr 4, 2020
3446ff2
Update
Warchant Apr 7, 2020
12ec80d
Delete altcpp submodule
Warchant Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions btcdev.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,17 @@ RUN git clone --progress -b v1.26.x http://github.com/grpc/grpc/ && \
) && \
rm -rf grpc

RUN git clone --progress https://github.com/VeriBlock/alt-integration-cpp.git && \
( \
cd alt-integration-cpp; \
git submodule update --init --recursive; \
mkdir build; \
cd build; \
cmake .. -DCMAKE_BUILD_TYPE=Release; \
make -j4 install; \
) && \
rm -rf alt-integration-cpp

RUN git clone --progress -b release-1.10.0 https://github.com/google/googletest.git && \
( \
cd googletest; \
Expand Down
6 changes: 5 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,9 +1250,11 @@ if test x$use_pkgconfig = xyes; then
[PKG_CHECK_MODULES],
[
echo "pkg-config is used..."
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib64/pkgconfig
PKG_CHECK_MODULES([GRPC], [grpc++ protobuf],, [AC_MSG_ERROR(grpc++/protobuf not found.)])
PKG_CHECK_MODULES([SSL], [libssl],, [AC_MSG_ERROR(openssl not found.)])
PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)])
PKG_CHECK_MODULES([ALT_INT], [altintegration],,[AC_MSG_ERROR(altintegration not found.)])
if test x$use_tests != xno; then
PKG_CHECK_MODULES([GMOCK], [gmock],,[AC_MSG_ERROR(gmock not found.)])
fi
Expand Down Expand Up @@ -1293,10 +1295,12 @@ else
AC_CHECK_LIB([crypto],[main],[GRPC_LIBS+=" -lcrypto"],AC_MSG_ERROR(crypto missing))
AC_CHECK_LIB([protobuf],[main],[GRPC_LIBS+=" -lprotobuf"],AC_MSG_ERROR(protobuf missing))
AC_CHECK_LIB([address_sorting],[main],[GRPC_LIBS+=" -laddress_sorting"],AC_MSG_ERROR(protobuf missing))
AC_CHECK_LIB([altintegration],[main],[ALT_INT_LIBS+=" -laltintegration"],AC_MSG_ERROR(altintegration missing))

if test x$use_tests != xno; then
AC_CHECK_HEADER([gmock/gmock.h],,AC_MSG_ERROR(libgmock headers missing))
AC_CHECK_LIB([gmock],[main],[GMOCK_LIBS=" -lgmock"],AC_MSG_ERROR(libgmock missing))
AC_CHECK_LIB([gtest],[main],[GMOCK_LIBS=" -lgtest"],AC_MSG_ERROR(libgtest missing))
AC_CHECK_LIB([gmock],[main],[GMOCK_LIBS+=" -lgmock"],AC_MSG_ERROR(libgmock missing))
fi

AC_ARG_VAR(GRPC_LIBS, "linker flags for GRPC")
Expand Down
5 changes: 3 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,8 @@ bitcoind_LDADD = \
$(LIBLEVELDB_SSE42) \
$(LIBMEMENV) \
$(LIBSECP256K1) \
$(GRPC_LIBS)
$(GRPC_LIBS) \
$(ALT_INT_LIBS)

bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)

Expand Down Expand Up @@ -710,7 +711,7 @@ if GLIBC_BACK_COMPAT
endif

libbitcoinconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
libbitcoinconsensus_la_LIBADD = $(LIBSECP256K1)
libbitcoinconsensus_la_LIBADD = $(LIBSECP256K1) $(ALT_INT_LIBS)
libbitcoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL
libbitcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)

Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.test.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ endif

test_test_bitcoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \
$(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(GRPC_LIBS) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) \
$(GMOCK_LIBS)
$(GMOCK_LIBS) $(ALT_INT_LIBS)
test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -g -Og

test_test_bitcoin_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(RAPIDCHECK_LIBS)
Expand Down
1 change: 0 additions & 1 deletion src/test/addrman_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,5 +671,4 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
BOOST_CHECK(addrman.SelectTriedCollision().ToString() == "[::]:0");
}


BOOST_AUTO_TEST_SUITE_END()
2 changes: 2 additions & 0 deletions src/test/cuckoocache_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) 2012-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <deque>

#include <boost/test/unit_test.hpp>
#include <cuckoocache.h>
#include <script/sigcache.h>
Expand Down