GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure option --enable-liquid for default liquidv1 chain

Browse source
This commit is contained in:
Gregory Sanders 2019-04-12 10:21:53 -04:00
parent a32cd1d363
commit 7eea59a2ca
3 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -194,10 +194,20 @@ AC_ARG_ENABLE([asm],
[use_asm=$enableval], [use_asm=$enableval],
[use_asm=yes]) [use_asm=yes])
AC_ARG_ENABLE([liquid],
[AS_HELP_STRING([--enable-liquid],
[Enable build that defaults to -chain=liquidv1])],
[liquid_build=yes],
[liquid_build=no])
if test "x$use_asm" = xyes; then if test "x$use_asm" = xyes; then
AC_DEFINE(USE_ASM, 1, [Define this symbol to build in assembly routines]) AC_DEFINE(USE_ASM, 1, [Define this symbol to build in assembly routines])
fi fi
if test "x$liquid_build" = xyes; then
AC_DEFINE(LIQUID, 1, [Define this symbol for Liquid builds])
fi
AC_ARG_WITH([system-univalue], AC_ARG_WITH([system-univalue],
[AS_HELP_STRING([--with-system-univalue], [AS_HELP_STRING([--with-system-univalue],
[Build with system UniValue (default is no)])], [Build with system UniValue (default is no)])],
@ -1378,6 +1388,7 @@ AM_CONDITIONAL([ENABLE_SSE41],[test x$enable_sse41 = xyes])
AM_CONDITIONAL([ENABLE_AVX2],[test x$enable_avx2 = xyes]) AM_CONDITIONAL([ENABLE_AVX2],[test x$enable_avx2 = xyes])
AM_CONDITIONAL([ENABLE_SHANI],[test x$enable_shani = xyes]) AM_CONDITIONAL([ENABLE_SHANI],[test x$enable_shani = xyes])
AM_CONDITIONAL([USE_ASM],[test x$use_asm = xyes]) AM_CONDITIONAL([USE_ASM],[test x$use_asm = xyes])
AM_CONDITIONAL([LIQUID],[test x$liquid_build = xyes])
AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version]) AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version]) AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
@ -1510,6 +1521,7 @@ echo " with test = $use_tests"
echo " with bench = $use_bench" echo " with bench = $use_bench"
echo " with upnp = $use_upnp" echo " with upnp = $use_upnp"
echo " use asm = $use_asm" echo " use asm = $use_asm"
echo " liquid_build = $liquid_build"
echo " sanitizers = $use_sanitizers" echo " sanitizers = $use_sanitizers"
echo " debug enabled = $enable_debug" echo " debug enabled = $enable_debug"
echo " gprof enabled = $enable_gprof" echo " gprof enabled = $enable_gprof"

6
src/test/util_tests.cpp
View file

@ -558,7 +558,11 @@ BOOST_AUTO_TEST_CASE(util_GetChainName)
std::string error; std::string error;
test_args.ParseParameters(0, (char**)argv_testnet, error); test_args.ParseParameters(0, (char**)argv_testnet, error);
BOOST_CHECK_EQUAL(test_args.GetChainName(), "elementsregtest"); std::string default_chain = "elementsregtest";
#if LIQUID
default_chain = "liquidv1";
#endif
BOOST_CHECK_EQUAL(test_args.GetChainName(), default_chain);
test_args.ParseParameters(2, (char**)argv_testnet, error); test_args.ParseParameters(2, (char**)argv_testnet, error);
BOOST_CHECK_EQUAL(test_args.GetChainName(), "test"); BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");

7
src/util.cpp
View file

@ -980,7 +980,12 @@ std::string ArgsManager::GetChainName() const
return CBaseChainParams::REGTEST; return CBaseChainParams::REGTEST;
if (fTestNet) if (fTestNet)
return CBaseChainParams::TESTNET; return CBaseChainParams::TESTNET;
return GetArg("-chain", "elementsregtest");
std::string default_chain = "elementsregtest";
#ifdef LIQUID
default_chain = "liquidv1";
#endif
return GetArg("-chain", default_chain);
} }
#ifndef WIN32 #ifndef WIN32