Rename libzcashconsensus.la -> libzcash_script.la
This commit is contained in:
parent
ea8065917e
commit
90232f65ae
|
@ -112,7 +112,7 @@ qa/cache/*
|
||||||
|
|
||||||
/doc/doxygen/
|
/doc/doxygen/
|
||||||
|
|
||||||
libzcashconsensus.pc
|
libzcash_script.pc
|
||||||
|
|
||||||
contrib/debian/files
|
contrib/debian/files
|
||||||
contrib/debian/substvars
|
contrib/debian/substvars
|
||||||
|
|
|
@ -19,7 +19,7 @@ GZIP_ENV="-9n"
|
||||||
|
|
||||||
if BUILD_BITCOIN_LIBS
|
if BUILD_BITCOIN_LIBS
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = libzcashconsensus.pc
|
pkgconfig_DATA = libzcash_script.pc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
|
BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
|
||||||
|
|
|
@ -872,8 +872,8 @@ AC_MSG_RESULT($build_bitcoin_utils)
|
||||||
AC_MSG_CHECKING([whether to build libraries])
|
AC_MSG_CHECKING([whether to build libraries])
|
||||||
AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
|
AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
|
||||||
if test x$build_bitcoin_libs = xyes; then
|
if test x$build_bitcoin_libs = xyes; then
|
||||||
AC_DEFINE(HAVE_CONSENSUS_LIB, 1, [Define this symbol if the consensus lib has been built])
|
AC_DEFINE(HAVE_SCRIPT_LIB, 1, [Define this symbol if the script lib has been built])
|
||||||
AC_CONFIG_FILES([libzcashconsensus.pc:libzcashconsensus.pc.in])
|
AC_CONFIG_FILES([libzcash_script.pc:libzcash_script.pc.in])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_RESULT($build_bitcoin_libs)
|
AC_MSG_RESULT($build_bitcoin_libs)
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
|
||||||
|
Name: Zcash transparent script verification library
|
||||||
|
Description: Library for verifying scripts against the Zcash consensus protocol.
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
Libs: -L${libdir} -lzcash_script
|
||||||
|
Cflags: -I${includedir}
|
|
@ -1,10 +0,0 @@
|
||||||
prefix=@prefix@
|
|
||||||
exec_prefix=@exec_prefix@
|
|
||||||
libdir=@libdir@
|
|
||||||
includedir=@includedir@
|
|
||||||
|
|
||||||
Name: Zcash consensus library
|
|
||||||
Description: Library for the Zcash consensus protocol.
|
|
||||||
Version: @PACKAGE_VERSION@
|
|
||||||
Libs: -L${libdir} -lzcashconsensus
|
|
||||||
Cflags: -I${includedir}
|
|
|
@ -33,7 +33,7 @@ if ENABLE_ZMQ
|
||||||
LIBBITCOIN_ZMQ=libbitcoin_zmq.a
|
LIBBITCOIN_ZMQ=libbitcoin_zmq.a
|
||||||
endif
|
endif
|
||||||
if BUILD_BITCOIN_LIBS
|
if BUILD_BITCOIN_LIBS
|
||||||
LIBZCASH_CONSENSUS=libzcashconsensus.la
|
LIBZCASH_SCRIPT=libzcash_script.la
|
||||||
endif
|
endif
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
LIBBITCOIN_WALLET=libbitcoin_wallet.a
|
LIBBITCOIN_WALLET=libbitcoin_wallet.a
|
||||||
|
@ -88,7 +88,7 @@ EXTRA_LIBRARIES += \
|
||||||
$(LIBBITCOIN_ZMQ) \
|
$(LIBBITCOIN_ZMQ) \
|
||||||
$(LIBZCASH)
|
$(LIBZCASH)
|
||||||
|
|
||||||
lib_LTLIBRARIES = $(LIBZCASH_CONSENSUS)
|
lib_LTLIBRARIES = $(LIBZCASH_SCRIPT)
|
||||||
|
|
||||||
bin_PROGRAMS =
|
bin_PROGRAMS =
|
||||||
noinst_PROGRAMS =
|
noinst_PROGRAMS =
|
||||||
|
@ -543,10 +543,10 @@ libzcash_a_CPPFLAGS = $(AM_CPPFLAGS) $(PIC_FLAGS) $(BITCOIN_INCLUDES)
|
||||||
libzcash_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
libzcash_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||||
libzcash_a_LDFLAGS = $(AM_LDFLAGS)
|
libzcash_a_LDFLAGS = $(AM_LDFLAGS)
|
||||||
|
|
||||||
# zcashconsensus library #
|
# zcash_script library #
|
||||||
if BUILD_BITCOIN_LIBS
|
if BUILD_BITCOIN_LIBS
|
||||||
include_HEADERS = script/zcash_script.h
|
include_HEADERS = script/zcash_script.h
|
||||||
libzcashconsensus_la_SOURCES = \
|
libzcash_script_la_SOURCES = \
|
||||||
crypto/hmac_sha512.cpp \
|
crypto/hmac_sha512.cpp \
|
||||||
crypto/ripemd160.cpp \
|
crypto/ripemd160.cpp \
|
||||||
crypto/sha1.cpp \
|
crypto/sha1.cpp \
|
||||||
|
@ -562,13 +562,13 @@ libzcashconsensus_la_SOURCES = \
|
||||||
utilstrencodings.cpp
|
utilstrencodings.cpp
|
||||||
|
|
||||||
if GLIBC_BACK_COMPAT
|
if GLIBC_BACK_COMPAT
|
||||||
libzcashconsensus_la_SOURCES += compat/glibc_compat.cpp
|
libzcash_script_la_SOURCES += compat/glibc_compat.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libzcashconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
|
libzcash_script_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
|
||||||
libzcashconsensus_la_LIBADD = $(LIBSECP256K1)
|
libzcash_script_la_LIBADD = $(LIBSECP256K1)
|
||||||
libzcashconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/rust/include -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL
|
libzcash_script_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/rust/include -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL
|
||||||
libzcashconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
libzcash_script_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
#
|
#
|
||||||
|
|
|
@ -80,7 +80,7 @@ zcash_gtest_LDADD = \
|
||||||
$(LIBSECP256K1)
|
$(LIBSECP256K1)
|
||||||
|
|
||||||
zcash_gtest_LDADD += \
|
zcash_gtest_LDADD += \
|
||||||
$(LIBZCASH_CONSENSUS) \
|
$(LIBZCASH_SCRIPT) \
|
||||||
$(BOOST_LIBS) \
|
$(BOOST_LIBS) \
|
||||||
$(BOOST_UNIT_TEST_FRAMEWORK_LIB) \
|
$(BOOST_UNIT_TEST_FRAMEWORK_LIB) \
|
||||||
$(BDB_LIBS) \
|
$(BDB_LIBS) \
|
||||||
|
|
|
@ -130,7 +130,7 @@ test_test_bitcoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_C
|
||||||
$(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS)
|
$(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS)
|
||||||
test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||||
|
|
||||||
test_test_bitcoin_LDADD += $(LIBZCASH_CONSENSUS) $(BDB_LIBS) $(LIBZCASH) $(LIBRUSTZCASH) $(LIBZCASH_LIBS)
|
test_test_bitcoin_LDADD += $(LIBZCASH_SCRIPT) $(BDB_LIBS) $(LIBZCASH) $(LIBRUSTZCASH) $(LIBZCASH_LIBS)
|
||||||
test_test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
|
test_test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
|
||||||
|
|
||||||
if ENABLE_ZMQ
|
if ENABLE_ZMQ
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include "test/test_bitcoin.h"
|
#include "test/test_bitcoin.h"
|
||||||
#include "test/test_util.h"
|
#include "test/test_util.h"
|
||||||
|
|
||||||
#if defined(HAVE_CONSENSUS_LIB)
|
#if defined(HAVE_SCRIPT_LIB)
|
||||||
#include "script/zcash_script.h"
|
#include "script/zcash_script.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, ui
|
||||||
CMutableTransaction tx2 = tx;
|
CMutableTransaction tx2 = tx;
|
||||||
BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, flags, MutableTransactionSignatureChecker(&tx, 0, txCredit.vout[0].nValue), consensusBranchId, &err) == expect, message);
|
BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, flags, MutableTransactionSignatureChecker(&tx, 0, txCredit.vout[0].nValue), consensusBranchId, &err) == expect, message);
|
||||||
BOOST_CHECK_MESSAGE(expect == (err == SCRIPT_ERR_OK), std::string(ScriptErrorString(err)) + ": " + message);
|
BOOST_CHECK_MESSAGE(expect == (err == SCRIPT_ERR_OK), std::string(ScriptErrorString(err)) + ": " + message);
|
||||||
#if defined(HAVE_CONSENSUS_LIB)
|
#if defined(HAVE_SCRIPT_LIB)
|
||||||
CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
|
CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
|
||||||
stream << tx2;
|
stream << tx2;
|
||||||
BOOST_CHECK_MESSAGE(zcash_script_verify(
|
BOOST_CHECK_MESSAGE(zcash_script_verify(
|
||||||
|
|
|
@ -276,7 +276,7 @@ def build():
|
||||||
'Staging zeromq...',
|
'Staging zeromq...',
|
||||||
'Staging libsodium...',
|
'Staging libsodium...',
|
||||||
"Leaving directory '%s'" % depends_dir,
|
"Leaving directory '%s'" % depends_dir,
|
||||||
'config.status: creating libzcashconsensus.pc',
|
'config.status: creating libzcash_script.pc',
|
||||||
"Entering directory '%s'" % src_dir,
|
"Entering directory '%s'" % src_dir,
|
||||||
'httpserver.cpp',
|
'httpserver.cpp',
|
||||||
'torcontrol.cpp',
|
'torcontrol.cpp',
|
||||||
|
|
Loading…
Reference in New Issue