Skip to content

backport: Merge bitcoin#22496, 21985 #12601

backport: Merge bitcoin#22496, 21985

backport: Merge bitcoin#22496, 21985 #12601

Triggered via pull request May 17, 2024 06:47
@vijaydasmpvijaydasmp
synchronize #6024
Status Success
Total duration 34s
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: 6024, conflictPrs: [ { number: 4686, files: [ 'configure.ac', 'depends/Makefile', 'depends/packages/packages.mk', 'depends/packages/qt.mk', 'src/bench/block_assemble.cpp', 'src/chainparams.cpp', 'src/chainparams.h', 'src/consensus/consensus.h', 'src/consensus/params.h', 'src/consensus/tx_verify.cpp', 'src/qt/paymentserver.cpp', 'src/qt/test/test_main.cpp', 'src/qt/transactiondesc.cpp', 'src/random.cpp', 'src/rpc/misc.cpp', 'src/txmempool.cpp', 'src/wallet/wallet.cpp', 'test/functional/feature_llmq_chainlocks.py', 'test/functional/test_framework/test_framework.py' ], conflicts: [ 'test/functional/test_framework/test_framework.py' ] }, { number: 5799, files: [ 'src/bloom.cpp', 'src/bloom.h', 'src/chainparams.cpp', 'src/consensus/params.h', 'src/deploymentinfo.cpp', 'src/evo/deterministicmns.cpp', 'src/evo/dmnstate.cpp', 'src/evo/dmnstate.h', 'src/evo/providertx.cpp', 'src/evo/providertx.h', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/llmq/ehf_signals.cpp', 'src/masternode/payments.cpp', 'src/qt/masternodelist.cpp', 'src/rpc/blockchain.cpp', 'src/rpc/evo.cpp', 'src/rpc/masternode.cpp', 'src/test/block_reward_reallocation_tests.cpp', 'src/test/data/trivially_invalid.json', 'src/test/data/trivially_valid.json', 'src/test/evo_deterministicmns_tests.cpp', 'src/test/evo_trivialvalidation.cpp', 'test/functional/feature_dip0026.py', 'test/functional/feature_dip3_deterministicmns.py', 'test/functional/feature_llmq_evo.py', 'test/functional/rpc_blockchain.py', 'test/functional/rpc_masternode.py', 'test/functional/test_framework/test_framework.py', 'test/functional/test_runner.py' ], conflicts: [ 'test/functional/test_framework/test_framework.py' ] }, { 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/inte
main
Potential conflicts detected!