diff --git a/.gitignore b/.gitignore index fcb8fddf63..905ea6dd7d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ src/elements-gui src/elements-node src/elements-tx src/elements-util -src/elements-chainstate src/elements-wallet src/test/fuzz/fuzz src/test/test_bitcoin diff --git a/configure.ac b/configure.ac index 33ecd77f83..287efda2c7 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,6 @@ BITCOIN_GUI_NAME=elements-qt BITCOIN_CLI_NAME=elements-cli BITCOIN_TX_NAME=elements-tx BITCOIN_UTIL_NAME=elements-util -BITCOIN_CHAINSTATE_NAME=elements-chainstate BITCOIN_WALLET_TOOL_NAME=elements-wallet dnl Multi Process BITCOIN_MP_NODE_NAME=elements-node @@ -655,12 +654,6 @@ AC_ARG_ENABLE([util-util], [build_bitcoin_util=$enableval], [build_bitcoin_util=$build_bitcoin_utils]) -AC_ARG_ENABLE([experimental-util-chainstate], - [AS_HELP_STRING([--enable-experimental-util-chainstate], - [build experimental bitcoin-chainstate executable (default=no)])], - [build_bitcoin_chainstate=$enableval], - [build_bitcoin_chainstate=no]) - AC_ARG_WITH([libs], [AS_HELP_STRING([--with-libs], [build libraries (default=yes)])], @@ -1283,7 +1276,6 @@ if test "$enable_fuzz" = "yes"; then build_bitcoin_cli=no build_bitcoin_tx=no build_bitcoin_util=no - build_bitcoin_chainstate=no build_bitcoin_wallet=no build_bitcoind=no build_bitcoin_libs=no @@ -1648,10 +1640,6 @@ AC_MSG_CHECKING([whether to build bitcoin-util]) AM_CONDITIONAL([BUILD_BITCOIN_UTIL], [test $build_bitcoin_util = "yes"]) AC_MSG_RESULT($build_bitcoin_util) -AC_MSG_CHECKING([whether to build experimental bitcoin-chainstate]) -AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_bitcoin_chainstate = "yes"]) -AC_MSG_RESULT($build_bitcoin_chainstate) - AC_MSG_CHECKING([whether to build libraries]) AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test $build_bitcoin_libs = "yes"]) if test "$build_bitcoin_libs" = "yes"; then @@ -1872,7 +1860,6 @@ AC_SUBST(BITCOIN_GUI_NAME) AC_SUBST(BITCOIN_CLI_NAME) AC_SUBST(BITCOIN_TX_NAME) AC_SUBST(BITCOIN_UTIL_NAME) -AC_SUBST(BITCOIN_CHAINSTATE_NAME) AC_SUBST(BITCOIN_WALLET_TOOL_NAME) AC_SUBST(BITCOIN_MP_NODE_NAME) AC_SUBST(BITCOIN_MP_GUI_NAME) diff --git a/src/Makefile.am b/src/Makefile.am index 5d2b2c9712..3bcecf55dd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -106,10 +106,6 @@ if BUILD_BITCOIN_UTIL bin_PROGRAMS += elements-util endif -if BUILD_BITCOIN_CHAINSTATE - bin_PROGRAMS += bitcoin-chainstate -endif - .PHONY: FORCE check-symbols check-security # bitcoin core # BITCOIN_CORE_H = \ @@ -820,98 +816,6 @@ elements_util_LDADD = \ $(LIBSECP256K1) # -# bitcoin-chainstate binary # -bitcoin_chainstate_SOURCES = \ - bitcoin-chainstate.cpp \ - arith_uint256.cpp \ - blockfilter.cpp \ - chain.cpp \ - chainparamsbase.cpp \ - chainparams.cpp \ - clientversion.cpp \ - coins.cpp \ - compat/glibcxx_sanity.cpp \ - compressor.cpp \ - consensus/merkle.cpp \ - consensus/tx_check.cpp \ - consensus/tx_verify.cpp \ - core_read.cpp \ - dbwrapper.cpp \ - deploymentinfo.cpp \ - deploymentstatus.cpp \ - flatfile.cpp \ - fs.cpp \ - hash.cpp \ - index/base.cpp \ - index/blockfilterindex.cpp \ - index/coinstatsindex.cpp \ - init/common.cpp \ - key.cpp \ - logging.cpp \ - netaddress.cpp \ - node/blockstorage.cpp \ - node/chainstate.cpp \ - node/coinstats.cpp \ - node/ui_interface.cpp \ - policy/feerate.cpp \ - policy/fees.cpp \ - policy/packages.cpp \ - policy/policy.cpp \ - policy/rbf.cpp \ - policy/settings.cpp \ - pow.cpp \ - primitives/block.cpp \ - primitives/transaction.cpp \ - pubkey.cpp \ - random.cpp \ - randomenv.cpp \ - scheduler.cpp \ - script/interpreter.cpp \ - script/script.cpp \ - script/script_error.cpp \ - script/sigcache.cpp \ - script/standard.cpp \ - shutdown.cpp \ - signet.cpp \ - support/cleanse.cpp \ - support/lockedpool.cpp \ - sync.cpp \ - threadinterrupt.cpp \ - timedata.cpp \ - txdb.cpp \ - txmempool.cpp \ - uint256.cpp \ - util/asmap.cpp \ - util/bytevectorhash.cpp \ - util/getuniquepath.cpp \ - util/hasher.cpp \ - util/moneystr.cpp \ - util/rbf.cpp \ - util/serfloat.cpp \ - util/settings.cpp \ - util/strencodings.cpp \ - util/syscall_sandbox.cpp \ - util/system.cpp \ - util/thread.cpp \ - util/threadnames.cpp \ - util/time.cpp \ - util/tokenpipe.cpp \ - validation.cpp \ - validationinterface.cpp \ - versionbits.cpp \ - warnings.cpp -bitcoin_chainstate_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -bitcoin_chainstate_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_chainstate_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) -bitcoin_chainstate_LDADD = \ - $(LIBBITCOIN_CRYPTO) \ - $(LIBUNIVALUE) \ - $(LIBSECP256K1) \ - $(LIBLEVELDB) \ - $(LIBLEVELDB_SSE42) \ - $(LIBMEMENV) -# - # bitcoinconsensus library # if BUILD_BITCOIN_LIBS include_HEADERS = script/bitcoinconsensus.h diff --git a/src/bitcoin-chainstate.cpp b/src/bitcoin-chainstate.cpp deleted file mode 100644 index f93197350d..0000000000 --- a/src/bitcoin-chainstate.cpp +++ /dev/null @@ -1,262 +0,0 @@ -// Copyright (c) 2022 The Bitcoin Core developers -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. -// -// The bitcoin-chainstate executable serves to surface the dependencies required -// by a program wishing to use Bitcoin Core's consensus engine as it is right -// now. -// -// DEVELOPER NOTE: Since this is a "demo-only", experimental, etc. executable, -// it may diverge from Bitcoin Core's coding style. -// -// It is part of the libbitcoinkernel project. - -#include -#include -#include -#include -#include -#include -#include -#include