Skip to content

Commit

Permalink
Squashed 'libbitcoinkernel-sys/bitcoin/' changes from 1047757ea3b..48…
Browse files Browse the repository at this point in the history
…158303fe2

48158303fe2 kernel: Add pure kernel bitcoin-chainstate
bf80d2f5009 kernel: Add block index utility functions to C header
a6ab5345e3b kernel: Add function to read block undo data from disk to C header
845b824d6c7 kernel: Add functions to read block from disk to C header
9324c8c4f67 kernel: Add function for copying  block data to C header
368fc93fd80 kernel: Add functions for the block validation state to C header
eb6e25ac007 kernel: Add validation interface to C header
cdce4484005 kernel: Add interrupt function to C header
7e47ec78768 kernel: Add import blocks function to C header
2b803d50747 kernel: Add chainstate load options for in-memory dbs in C header
ea92eb13c4a kernel: Add options for reindexing in C header
8254f2035a7 kernel: Add block validation to C header
ad7b880346e Kernel: Add chainstate loading to kernel C header
583820c4487 kernel: Add chainstate manager object to C header
ec137a086a0 kernel: Add notifications context option to C header
62a89689266 kerenl: Add chain params context option to C header
bb482dcbd30 kernel: Add kernel library context object
d114ccfdf8a kernel: Add logging to kernel library C header
44c65c46c43 kernel: Introduce initial kernel C header API
69c03134440 Merge bitcoin/bitcoin#31269: validation: Remove RECENT_CONSENSUS_CHANGE validation result
42282592943 Merge bitcoin/bitcoin#31000: bench: add support for custom data directory
36f5effa178 Merge bitcoin/bitcoin#31235: addrman: cap the `max_pct` to not exceed the maximum number of addresses
98ad249b69f Merge bitcoin/bitcoin#31277: doc: mention `descriptorprocesspsbt` in psbt.md
b0222bbb494 Merge bitcoin/bitcoin#30239: Ephemeral Dust
1dda1892b6b Merge bitcoin/bitcoin#31037: test: enhance p2p_orphan_handling
5c2e291060c bench: Add basic CheckEphemeralSpends benchmark
3f6559fa581 Add release note for ephemeral dust
71a6ab4b33d test: unit test for CheckEphemeralSpends
21d28b2f362 fuzz: add ephemeral_package_eval harness
127719f516a test: Add CheckMempoolEphemeralInvariants
e2e30e89ba4 functional test: Add ephemeral dust tests
4e68f901390 rpc: disallow in-mempool prioritisation of dusty tx
e1d3e81ab4d policy: Allow dust in transactions, spent in-mempool
04b2714fbbc functional test: Add new -dustrelayfee=0 test case
ebb6cd82baf doc: mention `descriptorprocesspsbt` in psbt.md
2b33322169b Merge bitcoin/bitcoin#31249: test: Add combinerawtransaction test to rpc_createmultisig
3fb6229dcfd Merge bitcoin/bitcoin#31271: doc: correct typos
fa66e0887ca bench: add support for custom data directory
ad9c2cceda9 test, bench: specialize working directory name
9c5775c331e addrman: cap the `max_pct` to not exceed the maximum number of addresses
8d340be9247 Merge bitcoin/bitcoin#31181: cmake: Revamp `FindLibevent` module
9a8e5adb161 Merge bitcoin/bitcoin#31267: refactor: Drop deprecated space in operator""_mst
726cbee9553 doc: correct typos
9fdfb73ca84 doc: fix typos
af6088701a2 Merge bitcoin/bitcoin#31237: doc: Add missing 'blank=true' option in offline-signing-tutorial.md
7a526653022 Merge bitcoin/bitcoin#31239: test: clarify log messages when handling SOCKS5 proxy connections
900b17239fb Merge bitcoin/bitcoin#31259: doc: Fix missing comma in JSON example in REST-interface.md
faf21625652 refactor: Drop deprecated space in operator""_mst
c889890e4a3 Merge bitcoin/bitcoin#31264: doc: Fixup bitcoin-wallet manpage chain selection args
0f6d20e43f2 Merge bitcoin/bitcoin#31163: scripted-diff: get rid of remaining "command" terminology in protocol.{h,cpp}
5acd5e7f874 Merge bitcoin/bitcoin#31257: ci: make ctest stop on failure
19f277711eb Merge bitcoin/bitcoin#26593: tracing: Only prepare tracepoint arguments when actually tracing
e80e4c6ff91 validation: Remove RECENT_CONSENSUS_CHANGE validation result
fa729ab4a27 doc: Fixup bitcoin-wallet manpage chain selection args
5e3b444022c doc: Fix missing comma in JSON example in REST-interface.md
0903ce8dbc2 Merge bitcoin/bitcoin#30592: Remove mempoolfullrbf
f842d0801e1 Merge bitcoin/bitcoin#29686: Update manpage descriptions
36a22e56833 ci: make ctest stop on failure
83fab3212c9 test: Add combinerawtransaction test to rpc_createmultisig
018e5fcc462 Merge bitcoin/bitcoin#31190: TxDownloadManager followups
3a5f6027e16 Merge bitcoin/bitcoin#31171: depends: Specify CMake generator explicitly
99d9a093cf6 test: clarify log messages when handling SOCKS5 proxy connections
c9e67e214f0 Merge bitcoin/bitcoin#31238: fuzz: Limit wallet_notifications iterations
564238aabf1 Merge bitcoin/bitcoin#31164: net: Use actual memory size in receive buffer accounting
fa461d7a43a fuzz: Limit wallet_notifications iterations
ec375de39ff doc: Add missing 'blank=true' option in offline-signing-tutorial.md
5a96767e3f5 depends, libevent: Do not install *.pc files and remove patches for them
ffda355b5a2 cmake, refactor: Move `HAVE_EVHTTP_...` to `libevent` interface
b619bdc3303 cmake: Revamp `FindLibevent` module
2c90f8e08c4 Merge bitcoin/bitcoin#31232: ci: `add second_deadlock_stack=1` to TSAN options
5dc94d13d41 fuzz fix: assert MAX_PEER_TX_ANNOUNCEMENTS is not exceeded
45e2f8f87d8 Merge bitcoin/bitcoin#31173: cmake: Add `FindQRencode` module and enable `libqrencode` package for MSVC
80cb630bd94 Merge bitcoin/bitcoin#31216: Update secp256k1 subtree to v0.6.0
5161c2618cd ci: add second_deadlock_stack=1 to TSAN options
85224f92d52 Merge bitcoin/bitcoin#30811: build: Unify `-logsourcelocations` format
9719d373dc2 Merge bitcoin/bitcoin#30634: ci: Use clang-19 from apt.llvm.org
97235c446e9 build: Disable secp256k1 musig module
9e5089dbb02 build, msvc: Enable `libqrencode` vcpkg package
30089b0cb61 cmake: Add `FindQRencode` module
65b19419366 Merge bitcoin/bitcoin#31186: msvc: Update vcpkg manifest
d3388720837 Merge bitcoin/bitcoin#31206: doc: Use relative hyperlinks in release-process.md
ffc05fca6f7 Merge bitcoin/bitcoin#31220: doc: Fix word order in developer-notes.md
9f2c8287a24 Merge bitcoin/bitcoin#31192: depends, doc: List packages required to build `qt` package separately
03cff2c1421 Merge bitcoin/bitcoin#31191: build: Make G_FUZZING constexpr, require -DBUILD_FOR_FUZZING=ON to fuzz
44939e5de1b doc: Fix word order in developer-notes.md
b934954ad10 Merge bitcoin/bitcoin#30670: doc: Extend developer-notes with file-name-only debugging fix
05aebe3790f Merge bitcoin/bitcoin#30930: netinfo: add peer services column and outbound-only option
0ba680d41b4 Update secp256k1 subtree to v0.6.0
2d46a89386d Squashed 'src/secp256k1/' changes from 2f2ccc46954..0cdc758a563
d22a234ed27 net: Use actual memory size in receive buffer accounting
047b5e2af1f streams: add DataStream::GetMemoryUsage
c3a6722f34a net: Use DynamicUsage(m_type) in CSerializedNetMsg::GetMemoryUsage
c6594c0b142 memusage: Add DynamicUsage for std::string
7596282a556 memusage: Allow counting usage of vectors with different allocators
6463117a292 Merge bitcoin/bitcoin#31208: doc: archive release notes for v27.2
788c1324f3d build: Unify `-logsourcelocations` format
4747f030956 depends, doc: List packages required to build `qt` package separately
1a05c86ae47 doc: archive release notes for v27.2
9f71cff6ab3 doc: Use relative hyperlinks in release-process.md
f1bcf3edc50 Merge bitcoin/bitcoin#31139: test: added test to assert TX decode rpc error on submitpackage rpc
975b115e1a2 Merge bitcoin/bitcoin#31198: init: warn, don't error, when '-upnp' is set
4a0251c05dd Merge bitcoin/bitcoin#31187: ci: Do not error on unused-member-function in test each commit
e001dc3dc6e Merge bitcoin/bitcoin#31203: fuzz: fix `implicit-integer-sign-change` in wallet_create_transaction
5a26cf7773e fuzz: fix `implicit-integer-sign-change` in wallet_create_transaction
a1b3ccae4be init: warn, don't error, when '-upnp' is set
c189eec848e doc: release note for mempoolrullrbf removal
d47297c6aab rpc: Mark fullrbf and bip125-replaceable as deprecated
04a5dcee8ab docs: remove requirement to signal bip125
fafbf8acf41 Make G_FUZZING constexpr, require -DBUILD_FOR_FUZZING=ON to execute a fuzz target
fae3cf0ffa6 ci: Temporarily disable macOS/Windows fuzz step
f6577b71741 build, msvc: Update vcpkg manifest baseline
16e16013bfa build, msvc: Document `libevent` version pinning
ec47cd2b508 build, msvc: Drop no longer needed `liblzma` version pinning
9a0734df5f1 build, msvc: Reorder keys in `vcpkg.json`
8351562bec6 [fuzz] allow negative time jumps in txdownloadman_impl
917ab810d93 [doc] comment fixups from n30110
f07a533dfcb Merge bitcoin/bitcoin#24214: Fix unsigned integer overflows in interpreter
62516105536 Merge bitcoin/bitcoin#31015: build: have "make test" depend on "make all"
4a31f8ccc9d Merge bitcoin/bitcoin#31156: test: Don't enforce BIP94 on regtest unless specified by arg
02be3dced71 Merge bitcoin/bitcoin#31166: key: clear out secret data in `DecodeExtKey`
54d07dd37d5 ci: Do not error on unused-member-function in test each commit
47f50c7af55 doc: add bitcoin-qt man description
40b82e3ab0a doc: add bitcoin-util man description
a7bf80f3a2d doc: add bitcoin-tx man description
3f9a5168323 doc: add bitcoin-wallet man description
d8c0bb23ef8 doc: add bitcoin-cli man description
09abccfa772 doc: add bitcoind man description
97b790e844a Merge bitcoin/bitcoin#29420: test: extend the SOCKS5 Python proxy to actually connect to a destination
6b73eb9a1a2 Merge bitcoin/bitcoin#31064: init: Correct coins db cache size setting
27d12cf17f2 Merge bitcoin/bitcoin#31043: rpc: getorphantxs follow-up
7b66815b16b Merge bitcoin/bitcoin#30110: refactor: TxDownloadManager + fuzzing
dc97e7f6dba Merge bitcoin/bitcoin#30903: cmake: Add `FindZeroMQ` module
1b0b9b4c787 Extend possible debugging fixes with file-name-only
da10e0bab4a Merge bitcoin/bitcoin#30942: test: Remove dead code from interface_zmq test
111a23d9b36 Remove -mempoolfullrbf option
e96ffa98b04 Merge bitcoin/bitcoin#31142: test: fix intermittent failure in p2p_seednode.py, don't connect to random IPs
54c4b09f083 Merge bitcoin/bitcoin#31042: build: Rename `PACKAGE_*` variables to `CLIENT_*`
e60cecc8115 doc: add release note for 31156
fc7dfb3df5b test: Don't enforce BIP94 on regtest unless specified by arg
fabe90c8242 ci: Use clang-19 from apt.llvm.org
0de3e96e333 tracing: use bitcoind pid in bcc tracing examples
411c6cfc6c2 tracing: only prepare tracepoint args if attached
d524c1ec066 tracing: dedup TRACE macros & rename to TRACEPOINT
70713303b63 scripted-diff: Rename `PACKAGE_*` variables to `CLIENT_*`
332655cb52c build: Rename `PACKAGE_*` variables to `CLIENT_*`
e6e29e3c94c scripted-diff: Clarify "user agent" variable name
e2ba8236715 depends: Specify CMake generator explicitly
1c7ca6e64de Merge bitcoin/bitcoin#31093: Introduce `g_fuzzing` global for fuzzing checks
6e21dedbf2b Merge bitcoin/bitcoin#31130: Drop miniupnp dependency
d7fd766feb2 test: added test to assert TX decode rpc error on submitpackage rpc
559a8dd9c0a key: clear out secret data in `DecodeExtKey`
4120c7543ee scripted-diff: get rid of remaining "command" terminology in protocol.{h,cpp}
2a52718d734 Merge bitcoin/bitcoin#31152: functional test: Additional package evaluation coverage
9de9c858d5a test: enhance p2p_orphan_handling
33af14b62e4 test: reduce assert_debug_log reliance
0ea84bc362f test: explicitly check boolean verbosity is disallowed
7a2e6b68cd9 doc: add rpc guidance for boolean verbosity avoidance
698f302df8b rpc: disallow boolean verbosity in getorphantxs
63f5e6ec795 test: add entry and expiration time checks
808a708107e rpc: add entry time to getorphantxs
56bf3027144 refactor: rename rpc_getorphantxs to rpc_orphans
7824f6b0770 test: check that getorphantxs is hidden
ac68fcca701 rpc: disallow undefined verbosity in getorphantxs
25dacae9c7f Merge bitcoin/bitcoin#31040: test: Assert that when we add the max orphan amount that we cannot add anymore and that a random orphan gets dropped
40e5f26a3ff mapport: remove dead code in DispatchMapPort
38fdf7c1fb1 mapport: drop outdated comments
915640e191b depends: zeromq: don't install .pc files and remove patches for them
6b8a74463b5 cmake: Add `FindZeroMQ` module
9a7206a34e3 Merge bitcoin/bitcoin#29536: fuzz: fuzz connman with non-empty addrman + ASMap
d4abaf8c9d9 Merge bitcoin/bitcoin#29608: optimization: Preallocate addresses in GetAddr based on nNodes
b7b24352906 doc: add release note for #31130
1b6dec98da3 depends: drop miniupnpc
953533d0214 doc: remove mentions of UPnP
94ad614482f ci: remove UPnP options
f32c34d0c3d functional test: Additional package evaluation coverage
87532fe5585 netinfo: allow setting an outbound-only peer list
9f243cd7fa6 Introduce `g_fuzzing` global for fuzzing checks
b95adf057a4 Merge bitcoin/bitcoin#31150: util: Treat Assume as Assert when evaluating at compile-time
8f24e492e20 Merge bitcoin/bitcoin#29991: depends: sqlite 3.46.1
2ef5004f78c Merge bitcoin/bitcoin#31146: ci: Temporary workaround for old CCACHE_DIR cirrus env
8c12fe828de Merge bitcoin/bitcoin#29936: fuzz: wallet: add target for `CreateTransaction`
5c299ecafe6 test: Assert that when we add the max orphan amount that we cannot add anymore and that a random orphan gets dropped
0f4bc635854 [fuzz] txdownloadman and txdownload_impl
699643f23a1 [unit test] MempoolRejectedTx
fa584cbe727 [p2p] add TxDownloadOptions bool to make TxRequestTracker deterministic
f803c8ce8dd [p2p] filter 1p1c for child txid in recent rejects
5269d57e6d7 [p2p] don't process orphan if in recent rejects
2266eba43a9 [p2p] don't find 1p1cs for reconsiderable txns that are AlreadyHaveTx
fa7027d0fc1 [refactor] add CheckIsEmpty and GetOrphanTransactions, remove access to TxDownloadMan internals
969b07237b9 [refactor] wrap {Have,Get}TxToReconsider in txdownload
f150fb94e7d [refactor] make AlreadyHaveTx and Find1P1CPackage private to TxDownloadImpl
1e08195135b [refactor] move new tx logic to txdownload
257568eab5b [refactor] move invalid package processing to TxDownload
c4ce0c1218d [refactor] move invalid tx processing to TxDownload
c6b21749ca0 [refactor] move valid tx processing to TxDownload
a8cf3b6e845 [refactor] move Find1P1CPackage to txdownload
f497414ce76 [refactor] put peerman tasks at the end of ProcessInvalidTx
6797bc42a76 [p2p] restrict RecursiveDynamicUsage of orphans added to vExtraTxnForCompact
798cc8f5aac [refactor] move Find1P1CPackage into ProcessInvalidTx
416fbc952b2 [refactor] move new orphan handling to ProcessInvalidTx
c8e67b9169b [refactor] move ProcessInvalidTx and ProcessValidTx definitions down
3a41926d1b5 [refactor] move notfound processing to txdownload
042a97ce7fc [refactor] move tx inv/getdata handling to txdownload
58e09f244b4 [p2p] don't log tx invs when in IBD
288865338f5 [refactor] rename maybe_add_extra_compact_tx to first_time_failure
f48d36cd97e [refactor] move peer (dis)connection logic to TxDownload
f61d9e4b4b8 [refactor] move AlreadyHaveTx to TxDownload
84e4ef843db [txdownload] add read-only reference to mempool
af918349de5 [refactor] move ValidationInterface functions to TxDownloadManager
f6c860efb12 [doc] fix typo in m_lazy_recent_confirmed_transactions doc
5f9004e1550 [refactor] add TxDownloadManager wrapping TxOrphanage, TxRequestTracker, and bloom filters
947f2925d55 Merge bitcoin/bitcoin#31124: util: Remove RandAddSeedPerfmon
7640cfdd624 Merge bitcoin/bitcoin#31118: doc: replace `-?` with `-h` and `-help`
74fb19317ae Merge bitcoin/bitcoin#30849: refactor: migrate `bool GetCoin` to return `optional<Coin>`
c16e909b3e2 Merge bitcoin/bitcoin#28574: wallet: optimize migration process, batch db transactions
a9598e5eaab build: drop miniupnpc dependency
a5fcfb7385c interfaces: remove now unused 'use_upnp' arg from 'mapPort'
038bbe7b200 daemon: remove UPnP support
844770b05eb qt: remove UPnP settings
dd92911732d Merge bitcoin/bitcoin#31148: ci: display logs of failed unit tests automatically
fa69a5f4b76 util: Treat Assume as Assert when evaluating at compile-time
0c79c343a9f Merge bitcoin/bitcoin#31147: cmake, qt, test: Remove problematic code
8523d8c0fc8 ci: display logs of failed tests automatically
2f40e453ccd Merge bitcoin/bitcoin#29450: build: replace custom `MAC_OSX` macro with existing `__APPLE__`
cb7c5ca824e Add gdb and lldb links to debugging troubleshooting
6c6b2442eda build: Replace MAC_OSX macro with existing __APPLE__
fb46d57d4e7 cmake, qt, test: Remove problematic code
fa9747a8961 ci: Temporary workaround for old CCACHE_DIR cirrus env
6c9fe7b73ea test: Prevent connection attempts to random IPs in p2p_seednodes.py
bb97b1ffa9f test: fix intermittent timeout in p2p_seednodes.py
57529ac4dbb test: set P2PConnection.p2p_connected_to_node in peer_connect_helper()
22cd0e888c7 test: support WTX INVs from P2PDataStore and fix a comment
ebe42c00aa4 test: extend the SOCKS5 Python proxy to actually connect to a destination
9bb92c0e7ff util: Remove RandAddSeedPerfmon
c98fc36d094 wallet: migration, consolidate external wallets db writes
7c9076a2d2e wallet: migration, consolidate main wallet db writes
9ef20e86d7f wallet: provide WalletBatch to 'SetupDescriptorScriptPubKeyMans'
34bf0795fc0 wallet: refactor ApplyMigrationData to return util::Result<void>
aacaaaa0d3a wallet: provide WalletBatch to 'RemoveTxs'
57249ff6697 wallet: introduce active db txn listeners
91e065ec175 wallet: remove post-migration signals connection
055c0532fc8 wallet: provide WalletBatch to 'DeleteRecords'
122d103ca22 wallet: introduce 'SetWalletFlagWithDB'
6052c7891dc wallet: decouple default descriptors creation from external signer setup
f2541d09e13 wallet: batch MigrateToDescriptor() db transactions
66c9936455f bench: add coverage for wallet migration process
33a28e252a7 Change default help arg to `-help` and mention `-h` and `-?` as alternatives
f0130ab1a1e doc: replace `-?` with `-h` for bench_bitcoin help
681ebcceca7 netinfo: rename and hoist max level constant to use in top-level help
e7d307ce8cf netinfo: clarify relaytxes and addr_relay_enabled help docs
eef2a9d4062 netinfo: add peer services column
3a4a788ee0d init: Correct coins db cache size setting
2957ca96119 build: have "make test" depend on "make all"
bbbbaa0d9ac Fix unsigned integer overflows in interpreter
c4dc81f9c69 test: Remove dead code from interface_zmq
c495731a316 fuzz: wallet: add target for `CreateTransaction`
3db68e29ec6 wallet: move `ImportDescriptors`/`FuzzedWallet` to util
552cae243a1 fuzz: cover `ASMapHealthCheck` in connman target
33b0f3ae966 fuzz: use `ConsumeNetGroupManager` in connman target
18c8a0945bd fuzz: move `ConsumeNetGroupManager` to util
fe624631aeb fuzz: fuzz `connman` with a non-empty addrman
0a12cff2a8e fuzz: move `AddrManDeterministic` to util
4feaa287284 refactor: Rely on returned value of GetCoin instead of parameter
46dfbf169b4 refactor: Return optional of Coin in GetCoin
e31bfb26c21 refactor: Remove unrealistic simulation state
ba621ffb9cb test: improve debug log message from P2PConnection::connection_made()
def6dd0c597 depends: sqlite 3.46.1
66082ca3488 Preallocate addresses in GetAddr based on nNodes
REVERT: 1047757ea3b kernel: Add pure kernel bitcoin-chainstate
REVERT: c568fdf75fd kernel: Add block index utility functions to C header
REVERT: 0f1da1dcba5 kernel: Add function to read block undo data from disk to C header
REVERT: 45af559c9f6 kernel: Add functions to read block from disk to C header
REVERT: 2a7f8a8240c kernel: Add function for copying  block data to C header
REVERT: b19f5336c03 kernel: Add functions for the block validation state to C header
REVERT: 9c0ffa913f4 kernel: Add validation interface to C header
REVERT: a93318c6152 kernel: Add interrupt function to C header
REVERT: 51053f33720 kernel: Add import blocks function to C header
REVERT: 6b0ada2af42 kernel: Add chainstate load options for in-memory dbs in C header
REVERT: 34427bfa9c7 kernel: Add options for reindexing in C header
REVERT: ca57311c969 kernel: Add block validation to C header
REVERT: 44156d84838 Kernel: Add chainstate loading to kernel C header
REVERT: 2cee46cdcc1 kernel: Add chainstate manager object to C header
REVERT: 7102c7ae45e kernel: Add notifications context option to C header
REVERT: ed628a2a3c4 kerenl: Add chain params context option to C header
REVERT: 27643297ff7 kernel: Add kernel library context object
REVERT: 2ba22cf3f90 kernel: Add logging to kernel library C header
REVERT: 873874c03e9 kernel: Introduce initial kernel C header API

git-subtree-dir: libbitcoinkernel-sys/bitcoin
git-subtree-split: 48158303fe276cb2f8fbc53ff31a4162d8f55c84
  • Loading branch information
TheCharlatan committed Nov 14, 2024
1 parent 8bb47d4 commit a73b2bd
Show file tree
Hide file tree
Showing 321 changed files with 10,002 additions and 2,928 deletions.
24 changes: 5 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ jobs:
echo "TEST_BASE=$(git rev-list -n$((${{ env.MAX_COUNT }} + 1)) --reverse HEAD $EXCLUDE_MERGE_BASE_ANCESTORS | head -1)" >> "$GITHUB_ENV"
- run: |
sudo apt-get update
sudo apt-get install clang ccache build-essential cmake pkg-config python3-zmq libevent-dev libboost-dev libsqlite3-dev libdb++-dev systemtap-sdt-dev libminiupnpc-dev libzmq3-dev qtbase5-dev qttools5-dev qttools5-dev-tools qtwayland5 libqrencode-dev -y
sudo apt-get install clang ccache build-essential cmake pkg-config python3-zmq libevent-dev libboost-dev libsqlite3-dev libdb++-dev systemtap-sdt-dev libzmq3-dev qtbase5-dev qttools5-dev qttools5-dev-tools qtwayland5 libqrencode-dev -y
- name: Compile and run tests
run: |
# Run tests on commits after the last merge commit and before the PR head commit
# Use clang++, because it is a bit faster and uses less memory than g++
git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && CC=clang CXX=clang++ cmake -B build -DWERROR=ON -DWITH_ZMQ=ON -DBUILD_GUI=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWITH_BDB=ON -DWITH_MINIUPNPC=ON -DWITH_USDT=ON && cmake --build build -j $(nproc) && ctest --test-dir build -j $(nproc) && ./build/test/functional/test_runner.py -j $(( $(nproc) * 2 ))" ${{ env.TEST_BASE }}
git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && CC=clang CXX=clang++ cmake -B build -DWERROR=ON -DWITH_ZMQ=ON -DBUILD_GUI=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWITH_BDB=ON -DWITH_USDT=ON -DCMAKE_CXX_FLAGS='-Wno-error=unused-member-function' && cmake --build build -j $(nproc) && ctest --output-on-failure --stop-on-failure --test-dir build -j $(nproc) && ./build/test/functional/test_runner.py -j $(( $(nproc) * 2 ))" ${{ env.TEST_BASE }}
macos-native-arm64:
name: 'macOS 14 native, arm64, no depends, sqlite only, gui'
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
run: |
# A workaround for "The `brew link` step did not complete successfully" error.
brew install --quiet python@3 || brew link --overwrite python@3
brew install --quiet coreutils ninja pkg-config gnu-getopt ccache boost libevent miniupnpc zeromq qt@5 qrencode
brew install --quiet coreutils ninja pkg-config gnu-getopt ccache boost libevent zeromq qt@5 qrencode
- name: Set Ccache directory
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:

- name: Generate build system
run: |
cmake -B build --preset vs2022-static -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" -DBUILD_GUI=ON -DWITH_BDB=ON -DWITH_MINIUPNPC=ON -DWITH_ZMQ=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWERROR=ON
cmake -B build --preset vs2022-static -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" -DBUILD_GUI=ON -DWITH_BDB=ON -DWITH_ZMQ=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWERROR=ON
- name: Save vcpkg binary cache
uses: actions/cache/save@v4
Expand All @@ -199,7 +199,7 @@ jobs:
- name: Run test suite
working-directory: build
run: |
ctest -j $env:NUMBER_OF_PROCESSORS -C Release
ctest --output-on-failure --stop-on-failure -j $env:NUMBER_OF_PROCESSORS -C Release
- name: Run functional tests
working-directory: build
Expand All @@ -212,20 +212,6 @@ jobs:
shell: cmd
run: py -3 test\functional\test_runner.py --jobs %NUMBER_OF_PROCESSORS% --ci --quiet --tmpdirprefix=%RUNNER_TEMP% --combinedlogslen=99999999 --timeout-factor=%TEST_RUNNER_TIMEOUT_FACTOR% %TEST_RUNNER_EXTRA%

- name: Clone fuzz corpus
run: |
git clone --depth=1 https://github.com/bitcoin-core/qa-assets "$env:RUNNER_TEMP\qa-assets"
Set-Location "$env:RUNNER_TEMP\qa-assets"
Write-Host "Using qa-assets repo from commit ..."
git log -1
- name: Run fuzz binaries
working-directory: build
env:
BITCOINFUZZ: '${{ github.workspace }}\build\src\test\fuzz\Release\fuzz.exe'
shell: cmd
run: py -3 test\fuzz\test_runner.py --par %NUMBER_OF_PROCESSORS% --loglevel DEBUG %RUNNER_TEMP%\qa-assets\fuzz_corpora

asan-lsan-ubsan-integer-no-depends-usdt:
name: 'ASan + LSan + UBSan + integer, no depends, USDT'
runs-on: ubuntu-24.04 # has to match container in ci/test/00_setup_env_native_asan.sh for tracing tools
Expand Down
47 changes: 18 additions & 29 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()
#=============================
# Project / Package metadata
#=============================
set(PACKAGE_NAME "Bitcoin Core")
set(CLIENT_NAME "Bitcoin Core")
set(CLIENT_VERSION_MAJOR 28)
set(CLIENT_VERSION_MINOR 99)
set(CLIENT_VERSION_BUILD 0)
Expand Down Expand Up @@ -47,14 +47,14 @@ project(BitcoinCore
LANGUAGES NONE
)

set(PACKAGE_VERSION ${PROJECT_VERSION})
set(CLIENT_VERSION_STRING ${PROJECT_VERSION})
if(CLIENT_VERSION_RC GREATER 0)
string(APPEND PACKAGE_VERSION "rc${CLIENT_VERSION_RC}")
string(APPEND CLIENT_VERSION_STRING "rc${CLIENT_VERSION_RC}")
endif()

set(COPYRIGHT_HOLDERS "The %s developers")
set(COPYRIGHT_HOLDERS_FINAL "The ${PACKAGE_NAME} developers")
set(PACKAGE_BUGREPORT "https://github.com/bitcoin/bitcoin/issues")
set(COPYRIGHT_HOLDERS_FINAL "The ${CLIENT_NAME} developers")
set(CLIENT_BUGREPORT "https://github.com/bitcoin/bitcoin/issues")

#=============================
# Language setup
Expand Down Expand Up @@ -122,23 +122,9 @@ option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting execu
option(WERROR "Treat compiler warnings as errors." OFF)
option(WITH_CCACHE "Attempt to use ccache for compiling." ON)

option(WITH_MINIUPNPC "Enable UPnP." OFF)
if(WITH_MINIUPNPC)
find_package(MiniUPnPc MODULE REQUIRED)
endif()

option(WITH_ZMQ "Enable ZMQ notifications." OFF)
if(WITH_ZMQ)
if(VCPKG_TARGET_TRIPLET)
find_package(ZeroMQ CONFIG REQUIRED)
else()
# The ZeroMQ project has provided config files since v4.2.2.
# However, mainstream distributions do not yet provide CMake
# config files for ZeroMQ packages. If they do in the future,
# find_package(ZeroMQ) may be used instead.
find_package(PkgConfig REQUIRED)
pkg_check_modules(libzmq REQUIRED IMPORTED_TARGET libzmq>=4)
endif()
find_package(ZeroMQ 4.0.0 MODULE REQUIRED)
endif()

option(WITH_USDT "Enable tracepoints for Userspace, Statically Defined Tracing." OFF)
Expand All @@ -150,8 +136,7 @@ cmake_dependent_option(ENABLE_EXTERNAL_SIGNER "Enable external signer support."

cmake_dependent_option(WITH_QRENCODE "Enable QR code support." ON "BUILD_GUI" OFF)
if(WITH_QRENCODE)
find_package(PkgConfig REQUIRED)
pkg_check_modules(libqrencode REQUIRED IMPORTED_TARGET libqrencode)
find_package(QRencode MODULE REQUIRED)
set(USE_QRCODE TRUE)
endif()

Expand Down Expand Up @@ -236,15 +221,13 @@ if(BUILD_FOR_FUZZING)
set(BUILD_WALLET_TOOL OFF)
set(BUILD_GUI OFF)
set(ENABLE_EXTERNAL_SIGNER OFF)
set(WITH_MINIUPNPC OFF)
set(WITH_ZMQ OFF)
set(BUILD_TESTS OFF)
set(BUILD_GUI_TESTS OFF)
set(BUILD_BENCH OFF)
set(BUILD_FUZZ_BINARY ON)

target_compile_definitions(core_interface INTERFACE
ABORT_ON_FAILED_ASSUME
FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
)
endif()
Expand Down Expand Up @@ -326,10 +309,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
target_compile_definitions(core_interface INTERFACE
MAC_OSX
OBJC_OLD_DISPATCH_PROTOTYPES=0
)
target_compile_definitions(core_interface INTERFACE OBJC_OLD_DISPATCH_PROTOTYPES=0)
# These flags are specific to ld64, and may cause issues with other linkers.
# For example: GNU ld will interpret -dead_strip as -de and then try and use
# "ad_strip" as the symbol for the entry point.
Expand Down Expand Up @@ -457,6 +437,10 @@ configure_file(contrib/filter-lcov.py filter-lcov.py USE_SOURCE_PERMISSIONS COPY
# Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review.
try_append_cxx_flags("-fno-extended-identifiers" TARGET core_interface SKIP_LINK)

try_append_cxx_flags("-ffile-prefix-map=A=B" TARGET core_interface SKIP_LINK
IF_CHECK_PASSED "-ffile-prefix-map=${PROJECT_SOURCE_DIR}/src=."
)

# Currently all versions of gcc are subject to a class of bugs, see the
# gccbug_90348 test case (only reproduces on GCC 11 and earlier) and
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111843. To work around that, set
Expand Down Expand Up @@ -567,6 +551,12 @@ endif()
if(BUILD_TESTS)
enable_testing()
endif()

if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
# have "make test" depend on "make all"
set(CMAKE_SKIP_TEST_ALL_DEPENDENCY FALSE)
endif()

# TODO: The `CMAKE_SKIP_BUILD_RPATH` variable setting can be deleted
# in the future after reordering Guix script commands to
# perform binary checks after the installation step.
Expand Down Expand Up @@ -618,7 +608,6 @@ if(ENABLE_WALLET)
message(" - legacy wallets (Berkeley DB) ..... ${WITH_BDB}")
endif()
message(" external signer ..................... ${ENABLE_EXTERNAL_SIGNER}")
message(" port mapping using UPnP ............. ${WITH_MINIUPNPC}")
message(" ZeroMQ .............................. ${WITH_ZMQ}")
message(" USDT tracing ........................ ${WITH_USDT}")
message(" QR code (GUI) ....................... ${WITH_QRENCODE}")
Expand Down
7 changes: 2 additions & 5 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
"toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "x64-windows",
"BUILD_GUI": "ON",
"WITH_QRENCODE": "OFF"
"BUILD_GUI": "ON"
}
},
{
Expand All @@ -32,8 +31,7 @@
"toolchainFile": "$env{VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "x64-windows-static",
"BUILD_GUI": "ON",
"WITH_QRENCODE": "OFF"
"BUILD_GUI": "ON"
}
},
{
Expand Down Expand Up @@ -84,7 +82,6 @@
"ENABLE_WALLET": "ON",
"WARN_INCOMPATIBLE_BDB": "OFF",
"WITH_BDB": "ON",
"WITH_MINIUPNPC": "ON",
"WITH_MULTIPROCESS": "ON",
"WITH_QRENCODE": "ON",
"WITH_SQLITE": "ON",
Expand Down
3 changes: 1 addition & 2 deletions ci/test/00_setup_env_mac_native.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ export LC_ALL=C.UTF-8
export PIP_PACKAGES="--break-system-packages zmq"
export GOAL="install"
export CMAKE_GENERATOR="Ninja"
export BITCOIN_CONFIG="-DBUILD_GUI=ON -DWITH_ZMQ=ON -DWITH_MINIUPNPC=ON -DREDUCE_EXPORTS=ON"
export BITCOIN_CONFIG="-DBUILD_GUI=ON -DWITH_ZMQ=ON -DREDUCE_EXPORTS=ON"
export CI_OS_NAME="macos"
export NO_DEPENDS=1
export OSX_SDK=""
export RUN_FUZZ_TESTS=true
7 changes: 4 additions & 3 deletions ci/test/00_setup_env_native_asan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ else
fi

export CONTAINER_NAME=ci_native_asan
export PACKAGES="systemtap-sdt-dev clang-18 llvm-18 libclang-rt-18-dev python3-zmq qtbase5-dev qttools5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
export APT_LLVM_V="19"
export PACKAGES="systemtap-sdt-dev clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev python3-zmq qtbase5-dev qttools5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
export NO_DEPENDS=1
export GOAL="install"
export BITCOIN_CONFIG="\
-DWITH_USDT=ON -DWITH_ZMQ=ON -DWITH_BDB=ON -DWARN_INCOMPATIBLE_BDB=OFF -DBUILD_GUI=ON \
-DSANITIZERS=address,float-divide-by-zero,integer,undefined \
-DCMAKE_C_COMPILER=clang-18 \
-DCMAKE_CXX_COMPILER=clang++-18 \
-DCMAKE_C_COMPILER=clang-${APT_LLVM_V} \
-DCMAKE_CXX_COMPILER=clang++-${APT_LLVM_V} \
-DCMAKE_C_FLAGS='-ftrivial-auto-var-init=pattern' \
-DCMAKE_CXX_FLAGS='-ftrivial-auto-var-init=pattern -Wno-error=deprecated-declarations' \
-DAPPEND_CXXFLAGS='-std=c++23' \
Expand Down
9 changes: 5 additions & 4 deletions ci/test/00_setup_env_native_fuzz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ export LC_ALL=C.UTF-8

export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
export CONTAINER_NAME=ci_native_fuzz
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libevent-dev libboost-dev libsqlite3-dev"
export APT_LLVM_V="19"
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libevent-dev libboost-dev libsqlite3-dev"
export NO_DEPENDS=1
export RUN_UNIT_TESTS=false
export RUN_FUNCTIONAL_TESTS=false
Expand All @@ -18,9 +19,9 @@ export CI_CONTAINER_CAP="--cap-add SYS_PTRACE" # If run with (ASan + LSan), the
export BITCOIN_CONFIG="\
-DBUILD_FOR_FUZZING=ON \
-DSANITIZERS=fuzzer,address,undefined,float-divide-by-zero,integer \
-DCMAKE_C_COMPILER=clang-18 \
-DCMAKE_CXX_COMPILER=clang++-18 \
-DCMAKE_C_COMPILER=clang-${APT_LLVM_V} \
-DCMAKE_CXX_COMPILER=clang++-${APT_LLVM_V} \
-DCMAKE_C_FLAGS='-ftrivial-auto-var-init=pattern' \
-DCMAKE_CXX_FLAGS='-ftrivial-auto-var-init=pattern' \
"
export LLVM_SYMBOLIZER_PATH="/usr/bin/llvm-symbolizer-18"
export LLVM_SYMBOLIZER_PATH="/usr/bin/llvm-symbolizer-${APT_LLVM_V}"
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_native_previous_releases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export CONTAINER_NAME=ci_native_previous_releases
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04"
# Use minimum supported python3.10 and gcc-11, see doc/dependencies.md
export PACKAGES="gcc-11 g++-11 python3-zmq"
export DEP_OPTS="NO_UPNP=1 DEBUG=1 CC=gcc-11 CXX=g++-11"
export DEP_OPTS="DEBUG=1 CC=gcc-11 CXX=g++-11"
export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_dbcrash" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
export RUN_UNIT_TESTS_SEQUENTIAL="true"
export RUN_UNIT_TESTS="false"
Expand Down
4 changes: 2 additions & 2 deletions ci/test/00_setup_env_native_tidy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
export CONTAINER_NAME=ci_native_tidy
export TIDY_LLVM_V="18"
export PACKAGES="clang-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V}-dev llvm-${TIDY_LLVM_V}-dev libomp-${TIDY_LLVM_V}-dev clang-tidy-${TIDY_LLVM_V} jq libevent-dev libboost-dev libminiupnpc-dev libzmq3-dev systemtap-sdt-dev qtbase5-dev qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev"
export PACKAGES="clang-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V}-dev llvm-${TIDY_LLVM_V}-dev libomp-${TIDY_LLVM_V}-dev clang-tidy-${TIDY_LLVM_V} jq libevent-dev libboost-dev libzmq3-dev systemtap-sdt-dev qtbase5-dev qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev"
export NO_DEPENDS=1
export RUN_UNIT_TESTS=false
export RUN_FUNCTIONAL_TESTS=false
Expand All @@ -18,7 +18,7 @@ export RUN_CHECK_DEPS=true
export RUN_TIDY=true
export GOAL="install"
export BITCOIN_CONFIG="\
-DWITH_ZMQ=ON -DBUILD_GUI=ON -DBUILD_BENCH=ON -DWITH_MINIUPNPC=ON -DWITH_USDT=ON -DWITH_BDB=ON -DWARN_INCOMPATIBLE_BDB=OFF \
-DWITH_ZMQ=ON -DBUILD_GUI=ON -DBUILD_BENCH=ON -DWITH_USDT=ON -DWITH_BDB=ON -DWARN_INCOMPATIBLE_BDB=OFF \
-DENABLE_HARDENING=OFF \
-DCMAKE_C_COMPILER=clang-${TIDY_LLVM_V} \
-DCMAKE_CXX_COMPILER=clang++-${TIDY_LLVM_V} \
Expand Down
5 changes: 3 additions & 2 deletions ci/test/00_setup_env_native_tsan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ export LC_ALL=C.UTF-8

export CONTAINER_NAME=ci_native_tsan
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
export APT_LLVM_V="19"
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libc++abi-${APT_LLVM_V}-dev libc++-${APT_LLVM_V}-dev python3-zmq"
export DEP_OPTS="CC=clang-${APT_LLVM_V} CXX='clang++-${APT_LLVM_V} -stdlib=libc++'"
export GOAL="install"
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DSANITIZERS=thread \
-DAPPEND_CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION -D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES'"
4 changes: 2 additions & 2 deletions ci/test/00_setup_env_native_valgrind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ export LC_ALL=C.UTF-8

export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
export CONTAINER_NAME=ci_native_valgrind
export PACKAGES="valgrind clang-16 llvm-16 libclang-rt-16-dev python3-zmq libevent-dev libboost-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libsqlite3-dev"
export PACKAGES="valgrind clang-16 llvm-16 libclang-rt-16-dev python3-zmq libevent-dev libboost-dev libdb5.3++-dev libzmq3-dev libsqlite3-dev"
export USE_VALGRIND=1
export NO_DEPENDS=1
export TEST_RUNNER_EXTRA="--exclude feature_init,rpc_bind,feature_bind_extra" # feature_init excluded for now, see https://github.com/bitcoin/bitcoin/issues/30011 ; bind tests excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
export GOAL="install"
# TODO enable GUI
export BITCOIN_CONFIG="\
-DWITH_ZMQ=ON -DWITH_BDB=ON -DWITH_MINIUPNPC=ON -DWARN_INCOMPATIBLE_BDB=OFF -DBUILD_GUI=OFF \
-DWITH_ZMQ=ON -DWITH_BDB=ON -DWARN_INCOMPATIBLE_BDB=OFF -DBUILD_GUI=OFF \
-DCMAKE_C_COMPILER=clang-16 \
-DCMAKE_CXX_COMPILER=clang++-16 \
"
11 changes: 11 additions & 0 deletions ci/test/01_base_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
dpkg --add-architecture "$DPKG_ADD_ARCH"
fi

if [ -n "${APT_LLVM_V}" ]; then
${CI_RETRY_EXE} apt-get update
${CI_RETRY_EXE} apt-get install curl -y
curl "https://apt.llvm.org/llvm-snapshot.gpg.key" | tee "/etc/apt/trusted.gpg.d/apt.llvm.org.asc"
(
# shellcheck disable=SC2034
source /etc/os-release
echo "deb http://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-${APT_LLVM_V} main" > "/etc/apt/sources.list.d/llvm-toolchain-${VERSION_CODENAME}-${APT_LLVM_V}.list"
)
fi

if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
bash -c "dnf -y install epel-release"
bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES"
Expand Down
5 changes: 5 additions & 0 deletions ci/test/02_run_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,16 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
fi

if [ "$DANGER_CI_ON_HOST_CCACHE_FOLDER" ]; then
# Temporary exclusion for https://github.com/bitcoin/bitcoin/issues/31108
# to allow CI configs and envs generated in the past to work for a bit longer.
# Can be removed in March 2025.
if [ "${CCACHE_DIR}" != "/tmp/ccache_dir" ]; then
if [ ! -d "${CCACHE_DIR}" ]; then
echo "Error: Directory '${CCACHE_DIR}' must be created in advance."
exit 1
fi
CI_CCACHE_MOUNT="type=bind,src=${CCACHE_DIR},dst=${CCACHE_DIR}"
fi # End temporary exclusion
fi

docker network create --ipv6 --subnet 1111:1111::/112 ci-ip6net || true
Expand Down
4 changes: 2 additions & 2 deletions ci/test/03_test_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -ex

export ASAN_OPTIONS="detect_leaks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan"
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1"
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:second_deadlock_stack=1"
export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1"

echo "Number of available processing units: $(nproc)"
Expand Down Expand Up @@ -145,7 +145,7 @@ if [ "$RUN_CHECK_DEPS" = "true" ]; then
fi

if [ "$RUN_UNIT_TESTS" = "true" ]; then
DIR_UNIT_TEST_DATA="${DIR_UNIT_TEST_DATA}" LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" CTEST_OUTPUT_ON_FAILURE=ON ctest "${MAKEJOBS}" --timeout $(( TEST_RUNNER_TIMEOUT_FACTOR * 60 ))
DIR_UNIT_TEST_DATA="${DIR_UNIT_TEST_DATA}" LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" CTEST_OUTPUT_ON_FAILURE=ON ctest --stop-on-failure "${MAKEJOBS}" --timeout $(( TEST_RUNNER_TIMEOUT_FACTOR * 60 ))
fi

if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
Expand Down
Loading

0 comments on commit a73b2bd

Please sign in to comment.