Skip to content

backport: bitcoin#24322, #25064, #25065, #25168, #25281, #25290, #25307, #25487, #25607, #26003 (kernel backports) #7361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
knst wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

backport: bitcoin#24322, #25064, #25065, #25168, #25281, #25290, #25307, #25487, #25607, #26003 (kernel backports) #7361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4152190
Merge bitcoin/bitcoin#24322: [kernel 1/n] Introduce initial `libbitco…
knst Apr 28, 2022
df61afc
Merge bitcoin/bitcoin#26003: build: fix configuring with `--without-e…
knst Jun 14, 2026
2698665
refactor: add 2 new helpers DeploymentActiveAt and DeploymentActiveAf…
knst May 16, 2026
0afc9ea
Merge bitcoin/bitcoin#25168: refactor: Avoid passing params where not…
knst May 20, 2022
505ffbc
partial Merge bitcoin/bitcoin#25064: [kernel 2b/n] Add `ChainstateMan…
knst May 20, 2022
f1cc809
fix: sort name of headers and sources in Makefile.am
knst May 20, 2026
d309458
Merge bitcoin/bitcoin#25065: [kernel 2c/n] Introduce `kernel::Context…
knst Jun 4, 2022
3cdda56
Merge bitcoin/bitcoin#25307: doc: fix typo in kernel/context.h and ad…
knst Jun 9, 2022
2a2d4e6
Merge bitcoin/bitcoin#25281: build: Remove unused `LIBBITCOIN_KERNEL`…
knst Jun 17, 2022
8337636
Merge bitcoin/bitcoin#25290: [kernel 3a/n] Decouple `CTxMemPool` from…
knst Jun 29, 2022
96e4f71
Merge bitcoin/bitcoin#25607: [kernel 3d/n] Misc `ChainstateManager::O…
knst Jul 14, 2022
586000e
Merge bitcoin/bitcoin#25487: [kernel 3b/n] Decouple `{Dump,Load}Mempo…
knst Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/dash/lint-tidy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ iwyu_tool.py \
"src/compat" \
"src/dbwrapper.cpp" \
"src/init" \
"src/kernel/mempool_persist.cpp" \
"src/node/chainstate.cpp" \
"src/node/minisketchwrapper.cpp" \
"src/policy/feerate.cpp" \
Expand Down
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ export HOST=x86_64-pc-linux-gnu
export PACKAGES="python3-zmq"
export DEP_OPTS="NO_WALLET=1 CC=gcc-14 CXX=g++-14"
export GOAL="install"
export BITCOIN_CONFIG="--enable-reduce-exports CC=gcc-14 CXX=g++-14 --enable-experimental-util-chainstate"
export BITCOIN_CONFIG="--enable-reduce-exports CC=gcc-14 CXX=g++-14 --enable-experimental-util-chainstate --with-experimental-kernel-lib --enable-shared"
15 changes: 15 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,12 @@ AC_ARG_WITH([libs],
[build_bitcoin_libs=$withval],
[build_bitcoin_libs=yes])

AC_ARG_WITH([experimental-kernel-lib],
[AS_HELP_STRING([--with-experimental-kernel-lib],
[build experimental dashkernel library (default is to build if we're building libraries and the experimental build-chainstate executable)])],
[build_experimental_kernel_lib=$withval],
[build_experimental_kernel_lib=auto])

AC_ARG_WITH([daemon],
[AS_HELP_STRING([--with-daemon],
[build dashd daemon (default=yes)])],
Expand Down Expand Up @@ -1791,15 +1797,24 @@ AM_CONDITIONAL([BUILD_BITCOIN_UTIL], [test $build_bitcoin_util = "yes"])
AC_MSG_RESULT($build_bitcoin_util)

AC_MSG_CHECKING([whether to build experimental dash-chainstate])
if test "$build_bitcoin_chainstate" = "yes"; then
if test "$build_experimental_kernel_lib" = "no"; then
AC_MSG_ERROR([experimental dash-chainstate cannot be built without the experimental dashkernel library. Use --with-experimental-kernel-lib]);
fi
fi
AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_bitcoin_chainstate = "yes"])
AC_MSG_RESULT($build_bitcoin_chainstate)
Comment thread
knst marked this conversation as resolved.

AC_MSG_CHECKING([whether to build libraries])
AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test $build_bitcoin_libs = "yes"])

if test "$build_bitcoin_libs" = "yes"; then
AC_DEFINE([HAVE_CONSENSUS_LIB], [1], [Define this symbol if the consensus lib has been built])
AC_CONFIG_FILES([libdashconsensus.pc:libdashconsensus.pc.in])
fi

AM_CONDITIONAL([BUILD_BITCOIN_KERNEL_LIB], [test "$build_experimental_kernel_lib" != "no" && ( test "$build_experimental_kernel_lib" = "yes" || test "$build_bitcoin_chainstate" = "yes" )])

AC_MSG_RESULT($build_bitcoin_libs)

AC_LANG_POP
Expand Down
1 change: 1 addition & 0 deletions contrib/devtools/iwyu/bitcoin.core.imp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Nothing for now.
[
{ include: [ "<bits/chrono.h>", private, "<chrono>", public ] },
]
Loading
Loading