diff --git a/.gitignore b/.gitignore index e1ade7a55..56b26fdbc 100644 --- a/.gitignore +++ b/.gitignore @@ -112,7 +112,7 @@ qa/cache/* /doc/doxygen/ -libzcashconsensus.pc +libzcash_script.pc contrib/debian/files contrib/debian/substvars diff --git a/Makefile.am b/Makefile.am index 0cbef9ee5..a77f7e980 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ GZIP_ENV="-9n" if BUILD_BITCOIN_LIBS pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libzcashconsensus.pc +pkgconfig_DATA = libzcash_script.pc endif BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT) diff --git a/configure.ac b/configure.ac index 3e1f8f11a..1748721d4 100644 --- a/configure.ac +++ b/configure.ac @@ -872,8 +872,8 @@ AC_MSG_RESULT($build_bitcoin_utils) AC_MSG_CHECKING([whether to build libraries]) AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) 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_CONFIG_FILES([libzcashconsensus.pc:libzcashconsensus.pc.in]) + AC_DEFINE(HAVE_SCRIPT_LIB, 1, [Define this symbol if the script lib has been built]) + AC_CONFIG_FILES([libzcash_script.pc:libzcash_script.pc.in]) fi AC_MSG_RESULT($build_bitcoin_libs) diff --git a/libzcash_script.pc.in b/libzcash_script.pc.in new file mode 100644 index 000000000..bd288484f --- /dev/null +++ b/libzcash_script.pc.in @@ -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} diff --git a/libzcashconsensus.pc.in b/libzcashconsensus.pc.in deleted file mode 100644 index 7391bb9da..000000000 --- a/libzcashconsensus.pc.in +++ /dev/null @@ -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} diff --git a/src/Makefile.am b/src/Makefile.am index ab1ed882e..7e2112a9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,7 @@ if ENABLE_ZMQ LIBBITCOIN_ZMQ=libbitcoin_zmq.a endif if BUILD_BITCOIN_LIBS -LIBZCASH_CONSENSUS=libzcashconsensus.la +LIBZCASH_SCRIPT=libzcash_script.la endif if ENABLE_WALLET LIBBITCOIN_WALLET=libbitcoin_wallet.a @@ -88,7 +88,7 @@ EXTRA_LIBRARIES += \ $(LIBBITCOIN_ZMQ) \ $(LIBZCASH) -lib_LTLIBRARIES = $(LIBZCASH_CONSENSUS) +lib_LTLIBRARIES = $(LIBZCASH_SCRIPT) bin_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_LDFLAGS = $(AM_LDFLAGS) -# zcashconsensus library # +# zcash_script library # if BUILD_BITCOIN_LIBS include_HEADERS = script/zcash_script.h -libzcashconsensus_la_SOURCES = \ +libzcash_script_la_SOURCES = \ crypto/hmac_sha512.cpp \ crypto/ripemd160.cpp \ crypto/sha1.cpp \ @@ -562,13 +562,13 @@ libzcashconsensus_la_SOURCES = \ utilstrencodings.cpp if GLIBC_BACK_COMPAT - libzcashconsensus_la_SOURCES += compat/glibc_compat.cpp + libzcash_script_la_SOURCES += compat/glibc_compat.cpp endif -libzcashconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) -libzcashconsensus_la_LIBADD = $(LIBSECP256K1) -libzcashconsensus_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_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) +libzcash_script_la_LIBADD = $(LIBSECP256K1) +libzcash_script_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/rust/include -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL +libzcash_script_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) endif # diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include index d3f28d159..0817ee51a 100644 --- a/src/Makefile.gtest.include +++ b/src/Makefile.gtest.include @@ -80,7 +80,7 @@ zcash_gtest_LDADD = \ $(LIBSECP256K1) zcash_gtest_LDADD += \ - $(LIBZCASH_CONSENSUS) \ + $(LIBZCASH_SCRIPT) \ $(BOOST_LIBS) \ $(BOOST_UNIT_TEST_FRAMEWORK_LIB) \ $(BDB_LIBS) \ diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 3db8cbf12..3bcff11da 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -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) 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 if ENABLE_ZMQ diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 3a4c0064e..9f5a36b3a 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -17,7 +17,7 @@ #include "test/test_bitcoin.h" #include "test/test_util.h" -#if defined(HAVE_CONSENSUS_LIB) +#if defined(HAVE_SCRIPT_LIB) #include "script/zcash_script.h" #endif @@ -81,7 +81,7 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, int flags, ui CMutableTransaction tx2 = tx; 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); -#if defined(HAVE_CONSENSUS_LIB) +#if defined(HAVE_SCRIPT_LIB) CDataStream stream(SER_NETWORK, PROTOCOL_VERSION); stream << tx2; BOOST_CHECK_MESSAGE(zcash_script_verify( diff --git a/zcutil/make-release.py b/zcutil/make-release.py index 8134bdfde..861566eb3 100755 --- a/zcutil/make-release.py +++ b/zcutil/make-release.py @@ -276,7 +276,7 @@ def build(): 'Staging zeromq...', 'Staging libsodium...', "Leaving directory '%s'" % depends_dir, - 'config.status: creating libzcashconsensus.pc', + 'config.status: creating libzcash_script.pc', "Entering directory '%s'" % src_dir, 'httpserver.cpp', 'torcontrol.cpp',