Rebased `cmake-staging` branch (post PR#15) #16

hebasto · 2023-07-07T14:36:02Z

This is the cmake-staging branch rebased on the recent bitcoin/master one with squashed "FIXUP" commits.

Rebase phase: cmake-staging/pr16-init --> cmake-staging/pr16-rebased.

Squash phase: cmake-staging/pr16-rebased --> cmake-staging/pr16-squashed. A diff must be zero :)

Previous linearization PRs:

A friendly reminder about that when testing native builds on Windows using MSBuild (Microsoft Build Engine), one can use the Chocolatey package manager to install required and optional tools:
choco install python3
choco install ccache --version=4.7.5

UPD-2, to build and test natively on Windows, run commands as follows:

mkdir build
cd build
cmake .. -A x64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
cmake --build . --config Release
ctest -C Release

Functional tests:

set BITCOIND=src\Release\bitcoind.exe
set BITCOINCLI=src\Release\bitcoin-cli.exe
set BITCOINUTIL=src\Release\bitcoin-util.exe
set BITCOINWALLET=src\Release\bitcoin-wallet.exe
python test\functional\test_runner.py

hebasto · 2023-07-07T14:38:05Z

@vasild @TheCharlatan @theStack @stickies-v @Sjors @sipsorcery @theuni @willcl-ark

Ready for extensive testing :)

The next meaningful PR with new commits is going to be based on this branch and will be submitted shortly.

theuni · 2023-07-07T14:52:23Z

I haven't dug into what's changed since the last rebase, but after performing a (clean) local merge I can confirm that only the following differences exist:

ELLSWIFT enabled
Fixed up comment
Updated file lists in various CMakeLists.txt

hebasto · 2023-07-07T18:12:53Z

The "cmake: Add CheckStdFilesystem module" commit has been removed as outdated. See:

hebasto · 2023-07-07T22:40:03Z

Here are 32 commits out of the 57 needed to obtain Guix release binaries. :)

hebasto · 2023-07-08T11:03:41Z

A friendly reminder about that when testing native builds on Windows using MSBuild (Microsoft Build Engine), one can use the Chocolatey package manager to install required and optional tools:

choco install python3
choco install ccache --version=4.7.5

TheCharlatan · 2023-07-10T07:45:01Z

test/CMakeLists.txt

+  set_configure_variable(BUILD_DAEMON BUILD_BITCOIND_TRUE)
+  set_configure_variable(WITH_ZMQ ENABLE_ZMQ)
+  set_configure_variable(ENABLE_EXTERNAL_SIGNER ENABLE_EXTERNAL_SIGNER)
+  set_configure_variable(USE_SYSCALL_SANDBOX ENABLE_SYSCALL_SANDBOX)


I think this should be removed as part of the rebase.

Thanks! Updated.

Co-authored-by: Cory Fields <cory-nospam-@coryfields.com> Co-authored-by: Vasil Dimov <vd@FreeBSD.org>

Co-authored-by: Cory Fields <cory-nospam-@coryfields.com>

To configure CMake for cross-compiling, use `--toolchain depends/${HOST}/share/toolchain.cmake` command-line option.

TheCharlatan · 2023-07-10T09:02:56Z

LGTM

hebasto · 2023-07-10T09:14:47Z

This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging.

Closing.

…tifications fuzz target fab164f fuzz: Avoid signed-integer-overflow in wallet_notifications fuzz target (MarcoFalke) Pull request description: Should avoid ``` policy/feerate.cpp:29:63: runtime error: signed integer overflow: 77600710321911316 * 149 cannot be represented in type 'int64_t' (aka 'long') #0 0x563a1775ed66 in CFeeRate::GetFee(unsigned int) const src/policy/feerate.cpp:29:63 #1 0x563a15913a69 in wallet::COutput::COutput(COutPoint const&, CTxOut const&, int, int, bool, bool, bool, long, bool, std::optional<CFeeRate>) src/./wallet/coinselection.h:91:57 #2 0x563a16fa6a6d in wallet::FetchSelectedInputs(wallet::CWallet const&, wallet::CCoinControl const&, wallet::CoinSelectionParams const&) src/wallet/spend.cpp:297:17 #3 0x563a16fc4512 in wallet::CreateTransactionInternal(wallet::CWallet&, std::vector<wallet::CRecipient, std::allocator<wallet::CRecipient>> const&, int, wallet::CCoinControl const&, bool) src/wallet/spend.cpp:1105:33 #4 0x563a16fbec74 in wallet::CreateTransaction(wallet::CWallet&, std::vector<wallet::CRecipient, std::allocator<wallet::CRecipient>> const&, int, wallet::CCoinControl const&, bool) src/wallet/spend.cpp:1291:16 #5 0x563a16fcf6df in wallet::FundTransaction(wallet::CWallet&, CMutableTransaction&, long&, int&, bilingual_str&, bool, std::set<int, std::less<int>, std::allocator<int>> const&, wallet::CCoinControl) src/wallet/spend.cpp:1361:16 #6 0x563a1597b7b9 in wallet::(anonymous namespace)::FuzzedWallet::FundTx(FuzzedDataProvider&, CMutableTransaction) src/wallet/test/fuzz/notifications.cpp:162:15 #7 0x563a15958240 in wallet::(anonymous namespace)::wallet_notifications_fuzz_target(Span<unsigned char const>)::$_0::operator()() const src/wallet/test/fuzz/notifications.cpp:228:23 #8 0x563a15958240 in unsigned long CallOneOf<wallet::(anonymous namespace)::wallet_notifications_fuzz_target(Span<unsigned char const>)::$_0, wallet::(anonymous namespace)::wallet_notifications_fuzz_target(Span<unsigned char const>)::$_1>(FuzzedDataProvider&, wallet::(anonymous namespace)::wallet_notifications_fuzz_target(Span<unsigned char const>)::$_0, wallet::(anonymous namespace)::wallet_notifications_fuzz_target(Span<unsigned char const>)::$_1) src/./test/fuzz/util.h:43:27 #9 0x563a15958240 in wallet::(anonymous namespace)::wallet_notifications_fuzz_target(Span<unsigned char const>) src/wallet/test/fuzz/notifications.cpp:196:9 #10 0x563a15fdef0c in std::function<void (Span<unsigned char const>)>::operator()(Span<unsigned char const>) const /usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_function.h:591:9 #11 0x563a15fdef0c in LLVMFuzzerTestOneInput src/test/fuzz/fuzz.cpp:178:5 #12 0x563a158032a4 in fuzzer::Fuzzer::ExecuteCallback(unsigned char const*, unsigned long) (/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/src/test/fuzz/fuzz+0x19822a4) (BuildId: 8acb42ad599d7f6d25b6f93e18fd564d80df7c06) #13 0x563a15802999 in fuzzer::Fuzzer::RunOne(unsigned char const*, unsigned long, bool, fuzzer::InputInfo*, bool, bool*) (/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/src/test/fuzz/fuzz+0x1981999) (BuildId: 8acb42ad599d7f6d25b6f93e18fd564d80df7c06) #14 0x563a15804586 in fuzzer::Fuzzer::ReadAndExecuteSeedCorpora(std::vector<fuzzer::SizedFile, std::allocator<fuzzer::SizedFile>>&) (/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/src/test/fuzz/fuzz+0x1983586) (BuildId: 8acb42ad599d7f6d25b6f93e18fd564d80df7c06) #15 0x563a15804aa7 in fuzzer::Fuzzer::Loop(std::vector<fuzzer::SizedFile, std::allocator<fuzzer::SizedFile>>&) (/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/src/test/fuzz/fuzz+0x1983aa7) (BuildId: 8acb42ad599d7f6d25b6f93e18fd564d80df7c06) #16 0x563a157f21fb in fuzzer::FuzzerDriver(int*, char***, int (*)(unsigned char const*, unsigned long)) (/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/src/test/fuzz/fuzz+0x19711fb) (BuildId: 8acb42ad599d7f6d25b6f93e18fd564d80df7c06) #17 0x563a1581c766 in main (/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/src/test/fuzz/fuzz+0x199b766) (BuildId: 8acb42ad599d7f6d25b6f93e18fd564d80df7c06) #18 0x7f499e17b0cf (/lib/x86_64-linux-gnu/libc.so.6+0x280cf) (BuildId: 96ab1a8f3b2c9a2ed37c7388615e6a726d037e89) #19 0x7f499e17b188 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x28188) (BuildId: 96ab1a8f3b2c9a2ed37c7388615e6a726d037e89) #20 0x563a157e70c4 in _start (/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/src/test/fuzz/fuzz+0x19660c4) (BuildId: 8acb42ad599d7f6d25b6f93e18fd564d80df7c06) SUMMARY: UndefinedBehaviorSanitizer: signed-integer-overflow policy/feerate.cpp:29:63 in MS: 0 ; base unit: 0000000000000000000000000000000000000000 0x3f,0x0,0x2f,0x5f,0x5f,0x5f,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0x7d,0xff,0xff,0xff,0xff,0xff,0x53,0xff,0xff,0xff,0xff,0xff,0x0,0x0,0x0,0x0,0x0,0x0,0x13,0x5e,0x5f,0x5f,0x8,0x25,0x0,0x5f,0x5f,0x5f,0x5f,0x5f,0x5f,0x8,0x25,0xca,0x7f,0x5f,0x5f,0x5f,0x13,0x13,0x5f,0x5f,0x5f,0x2,0xdb,0xca,0x0,0x0,0xe7,0xe6,0x66,0x65,0x0,0x0,0x0,0x0,0x44,0x3f,0xa,0xa,0xff,0xff,0xff,0xff,0xff,0x61,0x76,0x6f,0x69,0x0,0xb5,0x15, ?\000/___}}}}}}}}}}}}}}}}}}}}\377\377\377\377\377S\377\377\377\377\377\000\000\000\000\000\000\023^__\010%\000______\010%\312\177___\023\023___\002\333\312\000\000\347\346fe\000\000\000\000D?\012\012\377\377\377\377\377avoi\000\265\025 artifact_prefix='./'; Test unit written to ./crash-4d3bac8a64d4e58b2f0943e6d28e6e1f16328d7d Base64: PwAvX19ffX19fX19fX19fX19fX19fX19fX3//////1P//////wAAAAAAABNeX18IJQBfX19fX18IJcp/X19fExNfX18C28oAAOfmZmUAAAAARD8KCv//////YXZvaQC1FQ== ACKs for top commit: dergoegge: ACK fab164f brunoerg: ACK fab164f Tree-SHA512: f416828f4394aa7303ee437f141e9bbd23c0e0f1b830e4ef3932338858249ba68a811b9837c5b7ad8c6ab871b6354996434183597c1a910a8d8e8d829693e4b2

…when no change pos d55fdb1 Move TRACEx parameters to seperate lines (Richard Myers) 2d58629 wallet: fix coin selection tracing to return -1 when no change pos (Richard Myers) Pull request description: This is a bugfix for from when [optional was introduced](bitcoin@758501b) for `change_pos` in the wallet. When optional `change_pos` is unset, we should return -1 and not 0. I added two new checks to the `test/functional/interface_usdt_coinselection.py` which adds coverage for the situations when `normal_create_tx_internal` and `aps_create_tx_internal` events occur with no change. You can reproduce this bug using the coin-selection-simulation scripts as described in [issue #16](achow101/coin-selection-simulation#16). You can also run the `interface_usdt_coinselection.py` test without the changes to `wallet/spend.cpp`. ACKs for top commit: 0xB10C: ACK d55fdb1 achow101: ACK d55fdb1 murchandamus: ACK d55fdb1 Tree-SHA512: 6efac3b756bdf51debbcb759dc3c4b7a4304626bc047b70025cec02f3a04937ace7712e9558ac71e560fd136005a98c518ac5bb4b90c3282d776beccd0de9749

hebasto added 4 commits July 7, 2023 13:30

cmake: Add root CMakeLists.txt file

e0f4031

cmake: Add config/bitcoin-config.h support

48a99ce

cmake: Add cmake/introspection.cmake file

df7a584

cmake: Check system headers

1a2f19b

hebasto mentioned this pull request Jul 7, 2023

build: Add CMake-based build system (6 of N) #15

Merged

hebasto force-pushed the 230707-linear branch from b656c56 to e5a7823 Compare July 7, 2023 18:00

TheCharlatan reviewed Jul 10, 2023

View reviewed changes

hebasto and others added 18 commits July 10, 2023 09:35

cmake: Check system symbols

21536cf

Co-authored-by: Cory Fields <cory-nospam-@coryfields.com> Co-authored-by: Vasil Dimov <vd@FreeBSD.org>

cmake: Check compiler features

00ff297

cmake: Build crc32c static library

2b06e29

cmake: Build leveldb static library

ec143cf

Co-authored-by: Cory Fields <cory-nospam-@coryfields.com>

cmake: Add essential platform-specific definitions and options

38c5dae

cmake: Build minisketch static library

cbff309

cmake: Build secp256k1 static library

b50b0d1

cmake: Build univalue static library

d818469

cmake: Build bitcoin_crypto library

c84d4bc

cmake: Build bitcoin_util static library

0cc71df

cmake: Build bitcoin_consensus library

0ab1811

cmake: Build bitcoind executable

12f876f

build: Generate share/toolchain.cmake in depends

f4bd8a7

cmake: Add cross-compiling support

2e67655

To configure CMake for cross-compiling, use `--toolchain depends/${HOST}/share/toolchain.cmake` command-line option.

cmake: Add TristateOption module

970e4be

cmake: Add ccache support

3b69f3f

cmake: Add libnatpmp optional package support

cde6895

cmake: Add libminiupnpc optional package support

5cccf3c

hebasto added 10 commits July 10, 2023 09:36

cmake: Add libzmq optional package support

da690de

cmake: Add systemtap-sdt optional package support

98c9fd6

cmake: Build bitcoin-cli executable

1fb1cf5

cmake: Build bitcoin-tx executable

f260184

cmake: Build bitcoin-util executable

210693e

cmake: Add wallet functionality

20f6d18

cmake: Add test config and runners

6da00bb

cmake: Build bench_bitcoin executable

af71dc6

cmake: Build test_bitcoin executable

6d88504

cmake: Include CTest

3f513eb

hebasto force-pushed the 230707-linear branch from e5a7823 to 3f513eb Compare July 10, 2023 08:38

hebasto closed this Jul 10, 2023

hebasto deleted the 230707-linear branch July 10, 2023 09:21

hebasto mentioned this pull request Sep 16, 2023

Rebased cmake-staging branch (post PRs 17, 18, 19) #31

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebased `cmake-staging` branch (post PR#15) #16

Rebased `cmake-staging` branch (post PR#15) #16

hebasto commented Jul 7, 2023 •

edited

hebasto commented Jul 7, 2023

theuni commented Jul 7, 2023

hebasto commented Jul 7, 2023

hebasto commented Jul 7, 2023

hebasto commented Jul 8, 2023 •

edited

TheCharlatan Jul 10, 2023

hebasto Jul 10, 2023

TheCharlatan commented Jul 10, 2023

hebasto commented Jul 10, 2023

Rebased cmake-staging branch (post PR#15) #16

Rebased cmake-staging branch (post PR#15) #16

Conversation

hebasto commented Jul 7, 2023 • edited

hebasto commented Jul 7, 2023

theuni commented Jul 7, 2023

hebasto commented Jul 7, 2023

hebasto commented Jul 7, 2023

hebasto commented Jul 8, 2023 • edited

TheCharlatan Jul 10, 2023

Choose a reason for hiding this comment

hebasto Jul 10, 2023

Choose a reason for hiding this comment

TheCharlatan commented Jul 10, 2023

hebasto commented Jul 10, 2023

Rebased `cmake-staging` branch (post PR#15) #16

Rebased `cmake-staging` branch (post PR#15) #16

hebasto commented Jul 7, 2023 •

edited

hebasto commented Jul 8, 2023 •

edited