Skip to content

backport: Merge bitcoin#21162, 21043 #9014

backport: Merge bitcoin#21162, 21043

backport: Merge bitcoin#21162, 21043 #9014

Triggered via pull request November 22, 2023 05:00
@vijaydasmpvijaydasmp
synchronize #5723
Status Failure
Total duration 32s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

1 error and 3 warnings
main
Process completed with exit code 1.
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 5723, conflictPrs: [ { number: 4927, files: [ 'src/coinjoin/client.cpp', 'src/coinjoin/coinjoin.cpp', 'src/coinjoin/coinjoin.h', 'src/coinjoin/server.cpp', 'src/coinjoin/server.h', 'src/dsnotificationinterface.cpp', 'src/dsnotificationinterface.h', 'src/evo/cbtx.cpp', 'src/evo/cbtx.h', 'src/evo/mnhftx.cpp', 'src/evo/mnhftx.h', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/evo/specialtxman.cpp', 'src/evo/specialtxman.h', 'src/init.cpp', 'src/interfaces/node.cpp', 'src/llmq/blockprocessor.h', 'src/llmq/chainlocks.cpp', 'src/llmq/chainlocks.h', 'src/llmq/debug.cpp', 'src/llmq/debug.h', 'src/llmq/dkgsession.cpp', 'src/llmq/dkgsession.h', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/dkgsessionhandler.h', 'src/llmq/dkgsessionmgr.cpp', 'src/llmq/dkgsessionmgr.h', 'src/llmq/init.cpp', 'src/llmq/init.h', 'src/llmq/instantsend.cpp', 'src/llmq/instantsend.h', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 'src/llmq/signing.cpp', 'src/llmq/signing.h', 'src/llmq/signing_shares.cpp', 'src/llmq/signing_shares.h', 'src/llmq/snapshot.cpp', 'src/llmq/snapshot.h', 'src/miner.cpp', 'src/miner.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/node/context.cpp', 'src/node/context.h', 'src/rpc/rpcquorums.cpp', 'src/test/block_reward_reallocation_tests.cpp', 'src/test/blockfilter_index_tests.cpp', 'src/test/dynamic_activation_thresholds_tests.cpp', 'src/test/miner_tests.cpp', 'src/test/util.cpp', 'src/test/util/setup_common.cpp', 'src/test/validation_block_tests.cpp' ], conflicts: [ 'src/net_processing.cpp', 'src/net_processing.h' ] }, { number: 4798, files: [ 'src/Makefile.am', 'src/bloom.cpp', 'src/evo/cbtx.cpp', 'src/evo/deterministicmns.cpp', 'src/evo/deterministicmns.h', 'src/evo/mnhftx.cpp', 'src/init.cpp', 'src/llmq/blockprocessor.cpp', 'src/llmq/commitment.cpp', 'src/llmq/commitment.h', 'src/llmq/complex_utils.cpp', 'src/llmq/complex_utils.h', 'src/llmq/debug.cpp', 'src/llmq/dkgsession.cpp', 'src/llmq/dkgsession.h', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/dkgsessionmgr.cpp', 'src/llmq/dkgsessionmgr.h', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 'src/llmq/signing.cpp', 'src/llmq/signing_shares.cpp', 'src/llmq/snapshot.cpp', 'src/llmq/snapshot.h', 'src/llmq/utils.cpp', 'src/llmq/utils.h', 'src/miner.cpp', 'src/net_processing.cpp', 'src/rpc/rpcquorums.cpp', 'src/test/evo_utils_tests.cpp', 'src/util/hexstr.cpp', 'src/util/hexstr.h', 'test/lint/lint-circular-dependencies.sh' ], conflicts: [ 'src/net_processing.cpp' ] }, { 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: [ 'src/rpc/misc.cpp' ] }, { number: 4472, files: [ 'src/coinjoin/client.cp
main
Potential conflicts detected!