Skip to content

backport: Merge bitcoin#22214, 22120, 21745 #12570

backport: Merge bitcoin#22214, 22120, 21745

backport: Merge bitcoin#22214, 22120, 21745 #12570

Triggered via pull request May 15, 2024 12:36
@vijaydasmpvijaydasmp
synchronize #6016
Status Success
Total duration 40s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
main
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 6016, conflictPrs: [ { number: 5167, files: [ 'contrib/devtools/copyright_header.py', 'src/Makefile.am', 'src/analytics/sample.cpp', 'src/analytics/sample.h', 'src/analytics/sdclient.cpp', 'src/analytics/sdclient.h', 'src/analytics/sender.cpp', 'src/analytics/sender.h', 'src/init.cpp', 'src/net.cpp', 'src/net_processing.cpp', 'src/netbase.cpp', 'src/netbase.h', 'src/statsd_client.cpp', 'src/statsd_client.h', 'src/test/util/setup_common.cpp', 'src/validation.cpp', 'test/lint/lint-circular-dependencies.sh', 'test/lint/lint-cppcheck-dash.sh', 'test/lint/lint-format-strings.py', 'test/lint/lint-locale-dependence.sh' ], conflicts: [ 'src/net.cpp' ] }, { number: 5943, files: [ 'src/Makefile.am', 'src/Makefile.test.include', 'src/governance/governance.cpp', 'src/llmq/blockprocessor.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/signing.cpp', 'src/net.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/protocol.h', 'src/spork.cpp', 'src/spork.h', 'src/test/fuzz/txrequest.cpp', 'src/test/txrequest_tests.cpp', 'src/txrequest.cpp', 'src/txrequest.h', 'test/functional/p2p_tx_download.py' ], conflicts: [ 'src/net.h' ] }, { number: 5760, files: [ 'src/init.cpp', 'src/net.cpp', 'src/test/fuzz/process_message.cpp', 'src/test/fuzz/process_messages.cpp' ], conflicts: [ 'src/net.cpp' ] }, { number: 5997, files: [ 'doc/fuzzing.md', 'src/net.cpp', 'src/rpc/rawtransaction.cpp', 'src/rpc/util.h', 'src/wallet/rpcwallet.cpp' ], conflicts: [ 'src/net.cpp' ] }, { number: 5989, files: [ 'src/net.cpp', 'src/rpc/blockchain.cpp', 'src/wallet/coinselection.h', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'test/functional/p2p_invalid_messages.py', 'test/functional/rpc_blockchain.py' ], conflicts: [ 'src/net.cpp' ] }, { number: 5998, files: [ 'doc/tor.md', 'src/banman.cpp', 'src/immer/extra/guile/benchmark.scm', 'src/immer/extra/js/lib/mori.js', 'src/init.cpp', 'src/masternode/sync.cpp', 'src/net.cpp', 'src/qt/bitcoin.cpp', 'src/qt/bitcoingui.cpp', 'src/qt/dashstrings.cpp', 'src/qt/forms/intro.ui', 'src/qt/forms/modaloverlay.ui', 'src/qt/forms/psbtoperationsdialog.ui', 'src/qt/forms/qrdialog.ui', 'src/qt/forms/receiverequestdialog.ui', 'src/qt/forms/sendcoinsdialog.ui', 'src/qt/masternodelist.cpp', 'src/qt/modaloverlay.cpp', 'src/qt/qrimagewidget.cpp', 'src/qt/sendcoinsdialog.cpp', 'src/qt/transactionview.cpp', 'src/qt/utilitydialog.cpp', 'src/qt/walletcontroller.cpp', 'src/rpc/net.cpp', 'src/validation.cpp', 'src/wallet/load.cpp', 'src/wallet/rpcdump.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/scriptpubkeyman.cpp', 'src/wallet/wallet.cpp' ], conflicts: [ 'src/net.cpp', 'src/qt/sendcoinsdialog.cpp' ] }, { number: 6019, files: [ 'ci/test/00_setup_env_arm.sh', 'ci/test/00_setup_env_mac.sh', 'ci/test/00_setup_env_mac_host.sh', 'ci/test/00_setup_env_native_asan.sh', 'ci/test/00_setup_env_native_fuzz.sh', 'ci/test/00_setup_env_native_multiprocess.sh', 'ci/test/00_setup_env_native_nowallet.sh', 'ci/test/00_setup_env_native_qt5.sh', 'ci/test/00_setup_env_native_tsan.sh', 'ci/test/00_setup_env_s390x.sh', 'ci/t
main
Potential conflicts detected!