Skip to content

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

backport: Merge bitcoin#22214, 22120, 21745

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

Triggered via pull request May 15, 2024 13:29
@vijaydasmpvijaydasmp
synchronize #6016
Status Success
Total duration 29s
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: 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/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/test/00_setup_env_win64.sh', 'configure.ac', 'doc/Doxyfile.in', 'doc/build-openbsd.md', 'doc/external-signer.md', 'src/Makefile.am', 'src/Makefile.test.include', 'src/dummywallet.cpp', 'src/external_signer.cpp', 'src/external_signer.h', 'src/interfaces/node.h', 'src/interfaces/wallet.h', 'src/node/interfaces.cpp', 'src/qt/createwalletdialog.cpp', 'src/qt/createwalletdialog.h', 'src/qt/forms/createwalletdialog.ui', 'src/qt/forms/optionsdialog.ui', 'src/qt/forms/receiverequestdialog.ui', 'src/qt/optionsdialog.cpp', 'src/qt/optionsmodel.cpp', 'src/qt/optionsmodel.h', 'src/qt/receiverequestdialog.cpp', 'src/qt/sendcoinsdialog.cpp', 'src/qt/walletcontroller.cpp', 'src/qt/walletmodel.cpp', 'src/qt/walletmodel.h', 'src/qt/walletmodeltransaction.cpp', 'src/qt/walletmodeltransaction.h', 'src/rpc/client.cpp', 'src/rpc/external_signer.cpp', 'src/rpc/register.h', 'src/test/system_tests.cpp', 'src/util/error.cpp', 'src/util/error.h', 'src/util/system.cpp', 'src/util/system.h', 'src/wallet/external_signer_scriptpubkeyman.cpp', 'src/wallet/external_signer_scriptpubkeyman.h', 'src/wallet/init.cpp', 'src/wallet/interfaces.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/scriptpubkeyman.h', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'src/wallet/walletdb.cpp', 'src/wallet/walletdb.h', 'src/wallet/walletutil.h', 'test/config.ini.in', 'test/functional/mocks/invalid_signer.py', 'test/functional/mocks/signer.py', 'test/functional/rpc_help.py', 'test/functional/rpc_signer.py', 'test/functional/test_framework/test_framework.py', 'test/functional/test_framework/test_node.py', 'test/functional/test_runner.py', 'test/functional/wallet_signer.py' ], conflicts: [ 'src/interfaces/wallet.h', 'src/qt/sendcoinsdialog.cpp', 'src/wallet/interfaces.cpp' ] }, { number: 6020, files: [ 'ci/test/00_setup_env.sh', 'doc/benchmarking.md', 'src/bench/bench.h', '
main
Potential conflicts detected!