diff --git a/.gitignore b/.gitignore index 682b74bb1926..239014b41d70 100644 --- a/.gitignore +++ b/.gitignore @@ -40,8 +40,8 @@ config.log config.status configure libtool -src/config/dash-config.h -src/config/dash-config.h.in +src/config/bitcoin-config.h +src/config/bitcoin-config.h.in src/config/stamp-h1 src/obj share/setup.nsi diff --git a/configure.ac b/configure.ac index a2f6710f7189..e826f544c955 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]]) AC_INIT([Dash Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/dashpay/dash/issues],[dashcore],[https://dash.org/]) AC_CONFIG_SRCDIR([src/validation.cpp]) -AC_CONFIG_HEADERS([src/config/dash-config.h]) +AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) @@ -809,7 +809,7 @@ AC_C_BIGENDIAN dnl Check for pthread compile/link requirements AX_PTHREAD -dnl The following macro will add the necessary defines to dash-config.h, but +dnl The following macro will add the necessary defines to bitcoin-config.h, but dnl they also need to be passed down to any subprojects. Pull the results out of dnl the cache and add them to CPPFLAGS. AC_SYS_LARGEFILE @@ -1331,7 +1331,7 @@ define(MINIMUM_REQUIRED_BOOST, 1.47.0) dnl Check for boost libs AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST]) 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 AX_BOOST_FILESYSTEM AX_BOOST_THREAD diff --git a/contrib/debian/rules b/contrib/debian/rules index bc99302c5524..d55a3fa6bf01 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -10,7 +10,7 @@ override_dh_auto_clean: if [ -f Makefile ]; then $(MAKE) distclean; fi - rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/dash-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in + rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5) diff --git a/doc/shared-libraries.md b/doc/shared-libraries.md index 6db5f8d14ba3..0447e446231f 100644 --- a/doc/shared-libraries.md +++ b/doc/shared-libraries.md @@ -7,7 +7,7 @@ The purpose of this library is to make the verification functionality that is cr ### 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 @@ -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_SIZE_MISMATCH` - `txToLen` did not match with the size of `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) diff --git a/libdashconsensus.pc.in b/libdashconsensus.pc.in index 31d38aa865b3..71a7d50ab169 100644 --- a/libdashconsensus.pc.in +++ b/libdashconsensus.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ includedir=@includedir@ Name: @PACKAGE_NAME@ consensus library -Description: Library for the Bitcoin consensus protocol. +Description: Library for the Dash consensus protocol. Version: @PACKAGE_VERSION@ Libs: -L${libdir} -ldashconsensus Cflags: -I${includedir} diff --git a/src/Makefile.am b/src/Makefile.am index 64d1526b8a3e..19608f9272d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,41 +35,41 @@ BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVA BLS_LIBS=-lbls-dash -lrelic_s -LIBBITCOIN_SERVER=libdash_server.a -LIBBITCOIN_COMMON=libdash_common.a -LIBBITCOIN_CONSENSUS=libdash_consensus.a -LIBBITCOIN_CLI=libdash_cli.a -LIBBITCOIN_UTIL=libdash_util.a -LIBBITCOIN_CRYPTO_BASE=crypto/libdash_crypto_base.a -LIBBITCOINQT=qt/libdashqt.a +LIBBITCOIN_SERVER=libbitcoin_server.a +LIBBITCOIN_COMMON=libbitcoin_common.a +LIBBITCOIN_CONSENSUS=libbitcoin_consensus.a +LIBBITCOIN_CLI=libbitcoin_cli.a +LIBBITCOIN_UTIL=libbitcoin_util.a +LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.a +LIBBITCOINQT=qt/libbitcoinqt.a LIBSECP256K1=secp256k1/libsecp256k1.la if ENABLE_ZMQ -LIBBITCOIN_ZMQ=libdash_zmq.a +LIBBITCOIN_ZMQ=libbitcoin_zmq.a endif if BUILD_BITCOIN_LIBS LIBBITCOINCONSENSUS=libdashconsensus.la endif if ENABLE_WALLET -LIBBITCOIN_WALLET=libdash_wallet.a -LIBBITCOIN_WALLET_TOOL=libdash_wallet_tool.a +LIBBITCOIN_WALLET=libbitcoin_wallet.a +LIBBITCOIN_WALLET_TOOL=libbitcoin_wallet_tool.a endif LIBBITCOIN_CRYPTO= $(LIBBITCOIN_CRYPTO_BASE) if ENABLE_SSE41 -LIBBITCOIN_CRYPTO_SSE41 = crypto/libdash_crypto_sse41.a +LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.a LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41) endif if ENABLE_AVX2 -LIBBITCOIN_CRYPTO_AVX2 = crypto/libdash_crypto_avx2.a +LIBBITCOIN_CRYPTO_AVX2 = crypto/libbitcoin_crypto_avx2.a LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_AVX2) endif if ENABLE_X86_SHANI -LIBBITCOIN_CRYPTO_X86_SHANI = crypto/libdash_crypto_x86_shani.a +LIBBITCOIN_CRYPTO_X86_SHANI = crypto/libbitcoin_crypto_x86_shani.a LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_X86_SHANI) endif if ENABLE_ARM_SHANI -LIBBITCOIN_CRYPTO_ARM_SHANI = crypto/libdash_crypto_arm_shani.a +LIBBITCOIN_CRYPTO_ARM_SHANI = crypto/libbitcoin_crypto_arm_shani.a LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI) endif @@ -348,15 +348,15 @@ obj/build.h: FORCE @$(MKDIR_P) $(builddir)/obj @$(top_srcdir)/share/genbuild.sh "$(abs_top_builddir)/src/obj/build.h" \ "$(abs_top_srcdir)" -libdash_util_a-clientversion.$(OBJEXT): obj/build.h +libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h # server: shared between dashd and dash-qt # Contains code accessing mempool and chain state that is meant to be separated # from wallet and gui code (see node/README.md). Shared code should go in -# libdash_common or libdash_util libraries, instead. -libdash_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -libdash_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_server_a_SOURCES = \ +# libbitcoin_common or libbitcoin_util libraries, instead. +libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) +libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libbitcoin_server_a_SOURCES = \ addrdb.cpp \ addrman.cpp \ banman.cpp \ @@ -457,16 +457,16 @@ libdash_server_a_SOURCES = \ $(BITCOIN_CORE_H) if ENABLE_WALLET -libdash_server_a_SOURCES += wallet/init.cpp +libbitcoin_server_a_SOURCES += wallet/init.cpp endif if !ENABLE_WALLET -libdash_server_a_SOURCES += dummywallet.cpp +libbitcoin_server_a_SOURCES += dummywallet.cpp endif if ENABLE_ZMQ -libdash_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS) -libdash_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_zmq_a_SOURCES = \ +libbitcoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS) +libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libbitcoin_zmq_a_SOURCES = \ zmq/zmqabstractnotifier.cpp \ zmq/zmqnotificationinterface.cpp \ zmq/zmqpublishnotifier.cpp \ @@ -477,9 +477,9 @@ endif # wallet: shared between dashd and dash-qt, but only linked # when wallet enabled -libdash_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_wallet_a_SOURCES = \ +libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libbitcoin_wallet_a_SOURCES = \ coinjoin/client.cpp \ coinjoin/options.cpp \ coinjoin/util.cpp \ @@ -502,16 +502,16 @@ libdash_wallet_a_SOURCES = \ wallet/coinselection.cpp \ $(BITCOIN_CORE_H) -libdash_wallet_tool_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_wallet_tool_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_wallet_tool_a_SOURCES = \ +libbitcoin_wallet_tool_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libbitcoin_wallet_tool_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libbitcoin_wallet_tool_a_SOURCES = \ wallet/wallettool.cpp \ $(BITCOIN_CORE_H) # crypto primitives library -crypto_libdash_crypto_base_a_CPPFLAGS = $(AM_CPPFLAGS) $(PIC_FLAGS) -crypto_libdash_crypto_base_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS) -crypto_libdash_crypto_base_a_SOURCES = \ +crypto_libbitcoin_crypto_base_a_CPPFLAGS = $(AM_CPPFLAGS) $(PIC_FLAGS) +crypto_libbitcoin_crypto_base_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS) +crypto_libbitcoin_crypto_base_a_SOURCES = \ crypto/aes.cpp \ crypto/aes.h \ crypto/chacha_poly_aead.h \ @@ -546,23 +546,23 @@ crypto_libdash_crypto_base_a_SOURCES = \ crypto/siphash.h if USE_ASM -crypto_libdash_crypto_base_a_SOURCES += crypto/sha256_sse4.cpp +crypto_libbitcoin_crypto_base_a_SOURCES += crypto/sha256_sse4.cpp endif -crypto_libdash_crypto_sse41_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libdash_crypto_sse41_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libdash_crypto_sse41_a_CXXFLAGS += $(SSE41_CXXFLAGS) -crypto_libdash_crypto_sse41_a_CPPFLAGS += -DENABLE_SSE41 -crypto_libdash_crypto_sse41_a_SOURCES = crypto/sha256_sse41.cpp +crypto_libbitcoin_crypto_sse41_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libbitcoin_crypto_sse41_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libbitcoin_crypto_sse41_a_CXXFLAGS += $(SSE41_CXXFLAGS) +crypto_libbitcoin_crypto_sse41_a_CPPFLAGS += -DENABLE_SSE41 +crypto_libbitcoin_crypto_sse41_a_SOURCES = crypto/sha256_sse41.cpp -crypto_libdash_crypto_avx2_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libdash_crypto_avx2_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libdash_crypto_avx2_a_CXXFLAGS += $(AVX2_CXXFLAGS) -crypto_libdash_crypto_avx2_a_CPPFLAGS += -DENABLE_AVX2 -crypto_libdash_crypto_avx2_a_SOURCES = crypto/sha256_avx2.cpp +crypto_libbitcoin_crypto_avx2_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libbitcoin_crypto_avx2_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libbitcoin_crypto_avx2_a_CXXFLAGS += $(AVX2_CXXFLAGS) +crypto_libbitcoin_crypto_avx2_a_CPPFLAGS += -DENABLE_AVX2 +crypto_libbitcoin_crypto_avx2_a_SOURCES = crypto/sha256_avx2.cpp # x11 -crypto_libdash_crypto_base_a_SOURCES += \ +crypto_libbitcoin_crypto_base_a_SOURCES += \ crypto/blake.c \ crypto/bmw.c \ crypto/cubehash.c \ @@ -587,22 +587,22 @@ crypto_libdash_crypto_base_a_SOURCES += \ crypto/sph_skein.h \ crypto/sph_types.h -crypto_libdash_crypto_x86_shani_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libdash_crypto_x86_shani_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libdash_crypto_x86_shani_a_CXXFLAGS += $(X86_SHANI_CXXFLAGS) -crypto_libdash_crypto_x86_shani_a_CPPFLAGS += -DENABLE_X86_SHANI -crypto_libdash_crypto_x86_shani_a_SOURCES = crypto/sha256_x86_shani.cpp +crypto_libbitcoin_crypto_x86_shani_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libbitcoin_crypto_x86_shani_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libbitcoin_crypto_x86_shani_a_CXXFLAGS += $(X86_SHANI_CXXFLAGS) +crypto_libbitcoin_crypto_x86_shani_a_CPPFLAGS += -DENABLE_X86_SHANI +crypto_libbitcoin_crypto_x86_shani_a_SOURCES = crypto/sha256_x86_shani.cpp -crypto_libdash_crypto_arm_shani_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libdash_crypto_arm_shani_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libdash_crypto_arm_shani_a_CXXFLAGS += $(ARM_SHANI_CXXFLAGS) -crypto_libdash_crypto_arm_shani_a_CPPFLAGS += -DENABLE_ARM_SHANI -crypto_libdash_crypto_arm_shani_a_SOURCES = crypto/sha256_arm_shani.cpp +crypto_libbitcoin_crypto_arm_shani_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libbitcoin_crypto_arm_shani_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libbitcoin_crypto_arm_shani_a_CXXFLAGS += $(ARM_SHANI_CXXFLAGS) +crypto_libbitcoin_crypto_arm_shani_a_CPPFLAGS += -DENABLE_ARM_SHANI +crypto_libbitcoin_crypto_arm_shani_a_SOURCES = crypto/sha256_arm_shani.cpp # consensus: shared between all executables that validate any consensus rules. -libdash_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_consensus_a_SOURCES = \ +libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libbitcoin_consensus_a_SOURCES = \ amount.h \ arith_uint256.cpp \ arith_uint256.h \ @@ -622,7 +622,7 @@ libdash_consensus_a_SOURCES = \ primitives/transaction.h \ pubkey.cpp \ pubkey.h \ - script/dashconsensus.cpp \ + script/bitcoinconsensus.cpp \ script/interpreter.cpp \ script/interpreter.h \ script/script.cpp \ @@ -640,9 +640,9 @@ libdash_consensus_a_SOURCES = \ version.h # common: shared between dashd, and dash-qt and non-server tools -libdash_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_common_a_SOURCES = \ +libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libbitcoin_common_a_SOURCES = \ base58.cpp \ bech32.cpp \ bip39.cpp \ @@ -678,9 +678,9 @@ libdash_common_a_SOURCES = \ # util: shared between all executables. # This library *must* be included to make sure that the glibc # backward-compatibility objects and their sanity checks are linked. -libdash_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_util_a_SOURCES = \ +libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libbitcoin_util_a_SOURCES = \ bls/bls_batchverifier.h \ bls/bls_ies.cpp \ bls/bls_ies.h \ @@ -721,24 +721,24 @@ libdash_util_a_SOURCES = \ $(BITCOIN_CORE_H) if GLIBC_BACK_COMPAT -libdash_util_a_SOURCES += compat/glibc_compat.cpp +libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp AM_LDFLAGS += $(COMPAT_LDFLAGS) endif # cli: shared between dash-cli and dash-qt -libdash_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_cli_a_SOURCES = \ +libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libbitcoin_cli_a_SOURCES = \ compat/stdin.h \ compat/stdin.cpp \ rpc/client.cpp \ $(BITCOIN_CORE_H) -nodist_libdash_util_a_SOURCES = $(srcdir)/obj/build.h +nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # # dashd binary # -dashd_SOURCES = dashd.cpp +dashd_SOURCES = bitcoind.cpp dashd_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) dashd_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) dashd_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) @@ -767,7 +767,7 @@ dashd_LDADD = \ dashd_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(BLS_LIBS) $(GMP_LIBS) # dash-cli binary # -dash_cli_SOURCES = dash-cli.cpp +dash_cli_SOURCES = bitcoin-cli.cpp dash_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) dash_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) dash_cli_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) @@ -785,7 +785,7 @@ dash_cli_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(EVENT_LIBS) $(BLS_LIBS) $(GMP # # dash-tx binary # -dash_tx_SOURCES = dash-tx.cpp +dash_tx_SOURCES = bitcoin-tx.cpp dash_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) dash_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) dash_tx_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) @@ -806,7 +806,7 @@ dash_tx_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(BLS_LIBS) $(GMP_LIBS) # # dash-wallet binary # -dash_wallet_SOURCES = dash-wallet.cpp +dash_wallet_SOURCES = bitcoin-wallet.cpp dash_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) dash_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) dash_wallet_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) @@ -838,8 +838,8 @@ dash_wallet_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(BDB_LIBS) $(EVENT_PTHREADS # dashconsensus library # if BUILD_BITCOIN_LIBS -include_HEADERS = script/dashconsensus.h -libdashconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libdash_crypto_base_a_SOURCES) $(libdash_consensus_a_SOURCES) +include_HEADERS = script/bitcoinconsensus.h +libdashconsensus_la_SOURCES = support/cleanse.cpp $(crypto_libbitcoin_crypto_base_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) if GLIBC_BACK_COMPAT libdashconsensus_la_SOURCES += compat/glibc_compat.cpp @@ -883,12 +883,12 @@ CLEANFILES += obj/build.h EXTRA_DIST = $(CTAES_DIST) -config/dash-config.h: config/stamp-h1 +config/bitcoin-config.h: config/stamp-h1 @$(MAKE) -C $(top_builddir) $(subdir)/$(@) -config/stamp-h1: $(top_srcdir)/$(subdir)/config/dash-config.h.in $(top_builddir)/config.status +config/stamp-h1: $(top_srcdir)/$(subdir)/config/bitcoin-config.h.in $(top_builddir)/config.status $(AM_V_at)$(MAKE) -C $(top_builddir) $(subdir)/$(@) -$(top_srcdir)/$(subdir)/config/dash-config.h.in: $(am__configure_deps) - $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/dash-config.h.in +$(top_srcdir)/$(subdir)/config/bitcoin-config.h.in: $(am__configure_deps) + $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/bitcoin-config.h.in clean-local: diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index e83523d2fc70..1dbf03d94103 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -13,7 +13,7 @@ GENERATED_BENCH_FILES = $(RAW_BENCH_FILES:.raw=.raw.h) bench_bench_dash_SOURCES = \ $(RAW_BENCH_FILES) \ - bench/bench_dash.cpp \ + bench/bench_bitcoin.cpp \ bench/bench.cpp \ bench/bench.h \ bench/block_assemble.cpp \ diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 5fc6b047be90..713934552010 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -4,7 +4,7 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. bin_PROGRAMS += qt/dash-qt -EXTRA_LIBRARIES += qt/libdashqt.a +EXTRA_LIBRARIES += qt/libbitcoinqt.a # dash qt core # include Makefile.qt_locale.include @@ -40,6 +40,7 @@ QT_MOC_CPP = \ qt/moc_askpassphrasedialog.cpp \ qt/moc_createwalletdialog.cpp \ qt/moc_bantablemodel.cpp \ + qt/moc_bitcoin.cpp \ qt/moc_bitcoinaddressvalidator.cpp \ qt/moc_bitcoinamountfield.cpp \ qt/moc_bitcoingui.cpp \ @@ -48,7 +49,6 @@ QT_MOC_CPP = \ qt/moc_coincontroldialog.cpp \ qt/moc_coincontroltreewidget.cpp \ qt/moc_csvmodelwriter.cpp \ - qt/moc_dash.cpp \ qt/moc_editaddressdialog.cpp \ qt/moc_governancelist.cpp \ qt/moc_guiutil.cpp \ @@ -99,7 +99,7 @@ QT_MOC = \ qt/overviewpage.moc \ qt/rpcconsole.moc -QT_QRC_CPP = qt/qrc_dash.cpp +QT_QRC_CPP = qt/qrc_bitcoin.cpp QT_QRC = qt/dash.qrc QT_QRC_LOCALE_CPP = qt/qrc_dash_locale.cpp QT_QRC_LOCALE = qt/dash_locale.qrc @@ -110,6 +110,7 @@ BITCOIN_QT_H = \ qt/appearancewidget.h \ qt/askpassphrasedialog.h \ qt/bantablemodel.h \ + qt/bitcoin.h \ qt/bitcoinaddressvalidator.h \ qt/bitcoinamountfield.h \ qt/bitcoingui.h \ @@ -119,7 +120,6 @@ BITCOIN_QT_H = \ qt/coincontroltreewidget.h \ qt/createwalletdialog.h \ qt/csvmodelwriter.h \ - qt/dash.h \ qt/editaddressdialog.h \ qt/governancelist.h \ qt/guiconstants.h \ @@ -201,7 +201,7 @@ RES_ICONS = \ BITCOIN_QT_BASE_CPP = \ qt/appearancewidget.cpp \ qt/bantablemodel.cpp \ - qt/dash.cpp \ + qt/bitcoin.cpp \ qt/bitcoinaddressvalidator.cpp \ qt/bitcoinamountfield.cpp \ qt/bitcoingui.cpp \ @@ -350,18 +350,18 @@ BITCOIN_RC = qt/res/dash-qt-res.rc BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS -qt_libdashqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(QR_CFLAGS) -qt_libdashqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -qt_libdashqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS) +qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS) -qt_libdashqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \ +qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \ $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_FONTS) $(RES_MOVIES) if TARGET_DARWIN - qt_libdashqt_a_SOURCES += $(BITCOIN_MM) + qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM) endif -nodist_qt_libdashqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) \ +nodist_qt_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) \ $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP) # forms/foo.h -> forms/ui_foo.h @@ -370,7 +370,7 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI: # Most files will depend on the forms and moc files as includes. Generate them # before anything else. $(QT_MOC): $(QT_FORMS_H) -$(qt_libdashqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) : | $(QT_MOC) +$(qt_libbitcoinqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) : | $(QT_MOC) # dash-qt binary # qt_dash_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ @@ -381,7 +381,7 @@ qt_dash_qt_SOURCES = qt/main.cpp if TARGET_WINDOWS qt_dash_qt_SOURCES += $(BITCOIN_RC) endif -qt_dash_qt_LDADD = qt/libdashqt.a $(LIBBITCOIN_SERVER) +qt_dash_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET qt_dash_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET) endif @@ -401,9 +401,9 @@ SECONDARY: $(QT_QM) $(srcdir)/qt/dashstrings.cpp: FORCE @test -n $(XGETTEXT) || echo "xgettext is required for updating translations" - $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" $(PYTHON) ../share/qt/extract_strings_qt.py $(libdash_server_a_SOURCES) $(libdash_wallet_a_SOURCES) $(libdash_common_a_SOURCES) $(libdash_zmq_a_SOURCES) $(libdash_consensus_a_SOURCES) $(libdash_util_a_SOURCES) + $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" $(PYTHON) ../share/qt/extract_strings_qt.py $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES) -translate: $(srcdir)/qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/dash.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) +translate: $(srcdir)/qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/bitcoin.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) @test -n $(LUPDATE) || echo "lupdate is required for updating translations" $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -I$(srcdir) -locations relative -no-obsolete -ts $(srcdir)/qt/locale/dash_en.ts @test -n $(LCONVERT) || echo "lconvert is required for updating translations" @@ -419,12 +419,12 @@ $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(R @test -f $(RCC) $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name dash --format-version 1 $< > $@ -CLEAN_QT = $(nodist_qt_libdashqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_dash_locale.qrc qt/res/css/colors/* +CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_dash_locale.qrc qt/res/css/colors/* CLEANFILES += $(CLEAN_QT) dash_qt_clean: FORCE - rm -f $(CLEAN_QT) $(qt_libdashqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) qt/dash-qt$(EXEEXT) $(LIBBITCOINQT) + rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) qt/dash-qt$(EXEEXT) $(LIBBITCOINQT) dash_qt : qt/dash-qt$(EXEEXT) diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_bitcoin.cpp similarity index 100% rename from src/bench/bench_dash.cpp rename to src/bench/bench_bitcoin.cpp diff --git a/src/dash-cli.cpp b/src/bitcoin-cli.cpp similarity index 99% rename from src/dash-cli.cpp rename to src/bitcoin-cli.cpp index 0d5761138241..ea0823e0b026 100644 --- a/src/dash-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/dash-tx.cpp b/src/bitcoin-tx.cpp similarity index 99% rename from src/dash-tx.cpp rename to src/bitcoin-tx.cpp index 17a7a46a61c4..6b16e104504e 100644 --- a/src/dash-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/dash-wallet.cpp b/src/bitcoin-wallet.cpp similarity index 99% rename from src/dash-wallet.cpp rename to src/bitcoin-wallet.cpp index 4a308b0112bd..fcdf22d32972 100644 --- a/src/dash-wallet.cpp +++ b/src/bitcoin-wallet.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/dashd.cpp b/src/bitcoind.cpp similarity index 98% rename from src/dashd.cpp rename to src/bitcoind.cpp index 33090fd97cef..a82080495cba 100644 --- a/src/dashd.cpp +++ b/src/bitcoind.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include @@ -50,7 +50,7 @@ static bool AppInit(int argc, char* argv[]) util::ThreadSetInternalName("init"); - // If Qt is used, parameters/dash.conf are parsed in qt/dash.cpp's main() + // If Qt is used, parameters/dash.conf are parsed in qt/bitcoin.cpp's main() SetupServerArgs(node); ArgsManager& args = *Assert(node.args); std::string error; diff --git a/src/clientversion.h b/src/clientversion.h index 507287479031..245688ecae4f 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -6,12 +6,12 @@ #define BITCOIN_CLIENTVERSION_H #if defined(HAVE_CONFIG_H) -#include +#include #endif //HAVE_CONFIG_H // Check that required client information is defined #if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR) -#error Client version information missing: version is not defined by dash-config.h or in any other way +#error Client version information missing: version is not defined by bitcoin-config.h or in any other way #endif /** diff --git a/src/compat.h b/src/compat.h index b22bed897d50..ff5b46962b31 100644 --- a/src/compat.h +++ b/src/compat.h @@ -7,7 +7,7 @@ #define BITCOIN_COMPAT_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #ifdef WIN32 diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h index 60961e62087b..20db6a45adb8 100644 --- a/src/compat/byteswap.h +++ b/src/compat/byteswap.h @@ -6,7 +6,7 @@ #define BITCOIN_COMPAT_BYTESWAP_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/compat/endian.h b/src/compat/endian.h index 159dc593a5b0..26955a057de9 100644 --- a/src/compat/endian.h +++ b/src/compat/endian.h @@ -6,7 +6,7 @@ #define BITCOIN_COMPAT_ENDIAN_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include @@ -22,7 +22,7 @@ #ifndef HAVE_CONFIG_H // While not technically a supported configuration, defaulting to defining these // 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 #define HAVE_DECL_HTOBE16 1 #endif diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp index 07866fab742e..198b445071e2 100644 --- a/src/compat/glibc_compat.cpp +++ b/src/compat/glibc_compat.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/compat/stdin.cpp b/src/compat/stdin.cpp index a818d2242de7..98d406cca89e 100644 --- a/src/compat/stdin.cpp +++ b/src/compat/stdin.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include // for fileno(), stdin diff --git a/src/compat/strnlen.cpp b/src/compat/strnlen.cpp index beb23626a67f..72b69953d0af 100644 --- a/src/compat/strnlen.cpp +++ b/src/compat/strnlen.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/crypto/common.h b/src/crypto/common.h index f8440aab68ab..e14af1f4c40d 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -6,7 +6,7 @@ #define BITCOIN_CRYPTO_COMMON_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/crypto/muhash.h b/src/crypto/muhash.h index aee517c01895..0c050cd32b46 100644 --- a/src/crypto/muhash.h +++ b/src/crypto/muhash.h @@ -6,7 +6,7 @@ #define BITCOIN_CRYPTO_MUHASH_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/init.cpp b/src/init.cpp index 1d4c56a25bbe..fed793794b4a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index 116bcf9c801c..d76bf45bccce 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -41,7 +41,7 @@ #include #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/mapport.cpp b/src/mapport.cpp index 248dd584cc83..2df4ce45d2fd 100644 --- a/src/mapport.cpp +++ b/src/mapport.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/net.cpp b/src/net.cpp index d2fec0da2a76..f2951471885e 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/netaddress.h b/src/netaddress.h index ab688656c936..903cc2a1bdfd 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -6,7 +6,7 @@ #define BITCOIN_NETADDRESS_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/netbase.h b/src/netbase.h index fa57b5914cbe..eaf31c03dab3 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -6,7 +6,7 @@ #define BITCOIN_NETBASE_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 61d03a5cbcc5..eb347202c833 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/appearancewidget.cpp b/src/qt/appearancewidget.cpp index e74e91ba1be6..e265b0ead68d 100644 --- a/src/qt/appearancewidget.cpp +++ b/src/qt/appearancewidget.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index eeeeb0df2abf..c6b91a092be2 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/dash.cpp b/src/qt/bitcoin.cpp similarity index 99% rename from src/qt/dash.cpp rename to src/qt/bitcoin.cpp index 901c42c110c1..4ee2d11fb03d 100644 --- a/src/qt/dash.cpp +++ b/src/qt/bitcoin.cpp @@ -4,10 +4,10 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif -#include +#include #include #include diff --git a/src/qt/dash.h b/src/qt/bitcoin.h similarity index 96% rename from src/qt/dash.h rename to src/qt/bitcoin.h index e5c1b3cd3b9c..82f1535a477b 100644 --- a/src/qt/dash.h +++ b/src/qt/bitcoin.h @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_QT_DASH_H -#define BITCOIN_QT_DASH_H +#ifndef BITCOIN_QT_BITCOIN_H +#define BITCOIN_QT_BITCOIN_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include @@ -115,4 +115,4 @@ public Q_SLOTS: int GuiMain(int argc, char* argv[]); -#endif // BITCOIN_QT_DASH_H +#endif // BITCOIN_QT_BITCOIN_H diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 4a6f27d520ce..754b45572a46 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -6,7 +6,7 @@ #define BITCOIN_QT_BITCOINGUI_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 1dee7436ebe1..d0e57d0cbe24 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/createwalletdialog.cpp b/src/qt/createwalletdialog.cpp index 8e6ce89aab08..8e6474b0d401 100644 --- a/src/qt/createwalletdialog.cpp +++ b/src/qt/createwalletdialog.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index b0eb7ee3073f..6794abce5c39 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/locale/dash_en.ts b/src/qt/locale/dash_en.ts index 8f6024243415..a269f55073e2 100644 --- a/src/qt/locale/dash_en.ts +++ b/src/qt/locale/dash_en.ts @@ -418,7 +418,7 @@ BitcoinGUI - + A fatal error occurred. Dash Core can no longer continue safely and will quit. A fatal error occurred. Dash Core can no longer continue safely and will quit. @@ -2719,7 +2719,7 @@ https://www.transifex.com/projects/p/dash/ QObject - + Choose data directory on startup (default: %u) Choose data directory on startup (default: %u) diff --git a/src/qt/locale/dash_en.xlf b/src/qt/locale/dash_en.xlf index afc2bd1c8cab..c4049253d970 100644 --- a/src/qt/locale/dash_en.xlf +++ b/src/qt/locale/dash_en.xlf @@ -428,7 +428,7 @@ - + A fatal error occurred. Dash Core can no longer continue safely and will quit. diff --git a/src/qt/main.cpp b/src/qt/main.cpp index 4424aa3cf831..a05234589fdc 100644 --- a/src/qt/main.cpp +++ b/src/qt/main.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include +#include #include diff --git a/src/qt/notificator.h b/src/qt/notificator.h index ecd071ff4a64..bac7bda62217 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -6,7 +6,7 @@ #define BITCOIN_QT_NOTIFICATOR_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 5d8e64891988..a0eba83abe6b 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 1dfa244c2a06..935b8216ca8a 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 4f8d836a178a..ee784f12f82b 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index d274b1c56eb6..d4be4b565124 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -33,7 +33,7 @@ // #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/qrdialog.cpp b/src/qt/qrdialog.cpp index a74894fae598..3686d823852c 100644 --- a/src/qt/qrdialog.cpp +++ b/src/qt/qrdialog.cpp @@ -14,7 +14,7 @@ #include #if defined(HAVE_CONFIG_H) -#include /* for USE_QRCODE */ +#include /* for USE_QRCODE */ #endif QRDialog::QRDialog(QWidget *parent) : diff --git a/src/qt/qrimagewidget.cpp b/src/qt/qrimagewidget.cpp index 2ad72c02563a..531cccc5a73e 100644 --- a/src/qt/qrimagewidget.cpp +++ b/src/qt/qrimagewidget.cpp @@ -15,7 +15,7 @@ #include #if defined(HAVE_CONFIG_H) -#include /* for USE_QRCODE */ +#include /* for USE_QRCODE */ #endif #ifdef USE_QRCODE diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index 46ef6689ecda..20b994189934 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -14,7 +14,7 @@ #include #if defined(HAVE_CONFIG_H) -#include /* for USE_QRCODE */ +#include /* for USE_QRCODE */ #endif ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) : diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index b1c81659ad53..af08fd56d908 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index a08e9a1097da..14ad89776754 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 684653a7e25f..dbcaa5fa437b 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 34daf82c4e68..7392e2f9e12d 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp index d336cc318ad6..4486464cb89d 100644 --- a/src/qt/test/apptests.cpp +++ b/src/qt/test/apptests.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include @@ -16,7 +16,7 @@ #include #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp index 047bbb830987..a8d3a559732a 100644 --- a/src/qt/test/compattests.cpp +++ b/src/qt/test/compattests.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index a9afa16bf5d1..f237b70d2be6 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -4,11 +4,11 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include -#include +#include #include #include #include diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 22569aaf9ca6..77d6f1534fa4 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifdef HAVE_CONFIG_H -#include +#include #endif #include diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 372095428ff4..fd2e18be277a 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index dcdac6c16e1a..80faadeb6930 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 5bad69a469c5..071afdac0e77 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -11,7 +11,7 @@ #include