mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 11:32:46 +01:00
revert dash#1432: Rename consensus source library and API
It's a shared library, so we should keep its name and API distinguishable from Bitcoin's and avoid pkgconfig confusion Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
This commit is contained in:
parent
c587212f8c
commit
f02085e988
@ -19,7 +19,7 @@ export PYTHONPATH
|
|||||||
|
|
||||||
if BUILD_BITCOIN_LIBS
|
if BUILD_BITCOIN_LIBS
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = libbitcoinconsensus.pc
|
pkgconfig_DATA = libdashconsensus.pc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
|
BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
|
||||||
|
@ -1331,7 +1331,7 @@ define(MINIMUM_REQUIRED_BOOST, 1.47.0)
|
|||||||
dnl Check for boost libs
|
dnl Check for boost libs
|
||||||
AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST])
|
AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST])
|
||||||
if test x$want_boost = xno; then
|
if test x$want_boost = xno; then
|
||||||
AC_MSG_ERROR([[only libbitcoinconsensus can be built without boost]])
|
AC_MSG_ERROR([[only libdashconsensus can be built without boost]])
|
||||||
fi
|
fi
|
||||||
AX_BOOST_FILESYSTEM
|
AX_BOOST_FILESYSTEM
|
||||||
AX_BOOST_THREAD
|
AX_BOOST_THREAD
|
||||||
@ -1537,7 +1537,7 @@ 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_CONSENSUS_LIB, 1, [Define this symbol if the consensus lib has been built])
|
||||||
AC_CONFIG_FILES([libbitcoinconsensus.pc:libbitcoinconsensus.pc.in])
|
AC_CONFIG_FILES([libdashconsensus.pc:libdashconsensus.pc.in])
|
||||||
fi
|
fi
|
||||||
AC_MSG_RESULT($build_bitcoin_libs)
|
AC_MSG_RESULT($build_bitcoin_libs)
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ The purpose of this library is to make the verification functionality that is cr
|
|||||||
|
|
||||||
### API
|
### API
|
||||||
|
|
||||||
The interface is defined in the C header `dashconsensus.h` located in `src/script/dashconsensus.h`.
|
The interface is defined in the C header `bitcoinconsensus.h` located in `src/script/bitcoinconsensus.h`.
|
||||||
|
|
||||||
#### Version
|
#### Version
|
||||||
|
|
||||||
@ -39,9 +39,3 @@ The interface is defined in the C header `dashconsensus.h` located in `src/scri
|
|||||||
- `dashconsensus_ERR_TX_INDEX` - An invalid index for `txTo`
|
- `dashconsensus_ERR_TX_INDEX` - An invalid index for `txTo`
|
||||||
- `dashconsensus_ERR_TX_SIZE_MISMATCH` - `txToLen` did not match with the size of `txTo`
|
- `dashconsensus_ERR_TX_SIZE_MISMATCH` - `txToLen` did not match with the size of `txTo`
|
||||||
- `dashconsensus_ERR_DESERIALIZE` - An error deserializing `txTo`
|
- `dashconsensus_ERR_DESERIALIZE` - An error deserializing `txTo`
|
||||||
|
|
||||||
### Example Implementations
|
|
||||||
- [NBitcoin](https://github.com/NicolasDorier/NBitcoin/blob/master/NBitcoin/Script.cs#L814) (.NET Bindings)
|
|
||||||
- [node-libbitcoinconsensus](https://github.com/bitpay/node-libbitcoinconsensus) (Node.js Bindings)
|
|
||||||
- [java-libbitcoinconsensus](https://github.com/dexX7/java-libbitcoinconsensus) (Java Bindings)
|
|
||||||
- [bitcoinconsensus-php](https://github.com/Bit-Wasp/bitcoinconsensus-php) (PHP Bindings)
|
|
||||||
|
@ -4,7 +4,7 @@ libdir=@libdir@
|
|||||||
includedir=@includedir@
|
includedir=@includedir@
|
||||||
|
|
||||||
Name: @PACKAGE_NAME@ consensus library
|
Name: @PACKAGE_NAME@ consensus library
|
||||||
Description: Library for the Bitcoin consensus protocol.
|
Description: Library for the Dash consensus protocol.
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
Libs: -L${libdir} -ldashconsensus
|
Libs: -L${libdir} -ldashconsensus
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
@ -48,7 +48,7 @@ if ENABLE_ZMQ
|
|||||||
LIBBITCOIN_ZMQ=libbitcoin_zmq.a
|
LIBBITCOIN_ZMQ=libbitcoin_zmq.a
|
||||||
endif
|
endif
|
||||||
if BUILD_BITCOIN_LIBS
|
if BUILD_BITCOIN_LIBS
|
||||||
LIBBITCOINCONSENSUS=libbitcoinconsensus.la
|
LIBBITCOINCONSENSUS=libdashconsensus.la
|
||||||
endif
|
endif
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
LIBBITCOIN_WALLET=libbitcoin_wallet.a
|
LIBBITCOIN_WALLET=libbitcoin_wallet.a
|
||||||
@ -622,7 +622,7 @@ libbitcoin_consensus_a_SOURCES = \
|
|||||||
primitives/transaction.h \
|
primitives/transaction.h \
|
||||||
pubkey.cpp \
|
pubkey.cpp \
|
||||||
pubkey.h \
|
pubkey.h \
|
||||||
script/dashconsensus.cpp \
|
script/bitcoinconsensus.cpp \
|
||||||
script/interpreter.cpp \
|
script/interpreter.cpp \
|
||||||
script/interpreter.h \
|
script/interpreter.h \
|
||||||
script/script.cpp \
|
script/script.cpp \
|
||||||
@ -838,17 +838,17 @@ dash_wallet_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(BDB_LIBS) $(EVENT_PTHREADS
|
|||||||
|
|
||||||
# dashconsensus library #
|
# dashconsensus library #
|
||||||
if BUILD_BITCOIN_LIBS
|
if BUILD_BITCOIN_LIBS
|
||||||
include_HEADERS = script/dashconsensus.h
|
include_HEADERS = script/bitcoinconsensus.h
|
||||||
libbitcoinconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libbitcoin_crypto_base_a_SOURCES) $(libbitcoin_consensus_a_SOURCES)
|
libdashconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libbitcoin_crypto_base_a_SOURCES) $(libbitcoin_consensus_a_SOURCES)
|
||||||
|
|
||||||
if GLIBC_BACK_COMPAT
|
if GLIBC_BACK_COMPAT
|
||||||
libbitcoinconsensus_la_SOURCES += compat/glibc_compat.cpp
|
libdashconsensus_la_SOURCES += compat/glibc_compat.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libbitcoinconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
|
libdashconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
|
||||||
libbitcoinconsensus_la_LIBADD = $(LIBSECP256K1) $(BLS_LIBS) $(GMP_LIBS)
|
libdashconsensus_la_LIBADD = $(LIBSECP256K1) $(BLS_LIBS) $(GMP_LIBS)
|
||||||
libbitcoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL
|
libdashconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL
|
||||||
libbitcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
libdashconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
#
|
#
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#ifndef HAVE_CONFIG_H
|
#ifndef HAVE_CONFIG_H
|
||||||
// While not technically a supported configuration, defaulting to defining these
|
// While not technically a supported configuration, defaulting to defining these
|
||||||
// DECLs when we were compiled without autotools makes it easier for other build
|
// DECLs when we were compiled without autotools makes it easier for other build
|
||||||
// systems to build things like libbitcoinconsensus for strange targets.
|
// systems to build things like libdashconsensus for strange targets.
|
||||||
#ifdef htobe16
|
#ifdef htobe16
|
||||||
#define HAVE_DECL_HTOBE16 1
|
#define HAVE_DECL_HTOBE16 1
|
||||||
#endif
|
#endif
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
// Distributed under the MIT software license, see the accompanying
|
// Distributed under the MIT software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
#include <script/dashconsensus.h>
|
#include <script/bitcoinconsensus.h>
|
||||||
|
|
||||||
#include <primitives/transaction.h>
|
#include <primitives/transaction.h>
|
||||||
#include <pubkey.h>
|
#include <pubkey.h>
|
@ -17,7 +17,7 @@
|
|||||||
#include <streams.h>
|
#include <streams.h>
|
||||||
|
|
||||||
#if defined(HAVE_CONSENSUS_LIB)
|
#if defined(HAVE_CONSENSUS_LIB)
|
||||||
#include <script/dashconsensus.h>
|
#include <script/bitcoinconsensus.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user