Skip to content

backport: bitcoin#8456, #15704, #18850, #19241, #19317, #19493, #19739, #19903, #20003 #10110

backport: bitcoin#8456, #15704, #18850, #19241, #19317, #19493, #19739, #19903, #20003

backport: bitcoin#8456, #15704, #18850, #19241, #19317, #19493, #19739, #19903, #20003 #10110

Triggered via pull request January 11, 2024 01:23
@PastaPastaPastaPastaPastaPasta
synchronize #5813
Status Failure
Total duration 40s
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: 5813, conflictPrs: [ { number: 4321, files: [ 'src/Makefile.am', 'src/bls/bls.cpp', 'src/bls/bls.h', 'src/chainparams.cpp', 'src/chainparams.h', 'src/coinjoin/coinjoin-client.cpp', 'src/coinjoin/coinjoin-util.h', 'src/compressor.cpp', 'src/evo/simplifiedmns.cpp', 'src/interfaces/wallet.cpp', 'src/interfaces/wallet.h', 'src/key_io.cpp', 'src/key_io.h', 'src/keystore.cpp', 'src/keystore.h', 'src/rpc/governance.cpp', 'src/rpc/rpcevo.cpp', 'src/rpc/util.cpp', 'src/rpc/util.h', 'src/script/descriptor.cpp', 'src/script/interpreter.cpp', 'src/script/script.cpp', 'src/script/script.h', 'src/script/standard.cpp', 'src/script/standard.h', 'src/test/data/script_tests.json', 'src/test/test_dash.h', 'src/wallet/coincontrol.h', 'src/wallet/keypool.cpp', 'src/wallet/keypool.h', 'src/wallet/rpcwallet.cpp', 'src/wallet/test/coinjoin_tests.cpp', 'src/wallet/test/wallet_tests.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'src/wallet/walletdb.cpp', 'src/wallet/walletdb.h', 'test/lint/lint-circular-dependencies.sh' ], conflicts: [ 'src/chainparams.h', 'src/wallet/test/wallet_tests.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ] }, { number: 4472, files: [ 'src/coinjoin/client.cpp', 'src/coinjoin/client.h', 'src/coinjoin/coinjoin.cpp', 'src/coinjoin/coinjoin.h', 'src/coinjoin/server.cpp', 'src/coinjoin/server.h', 'src/evo/cbtx.cpp', 'src/evo/cbtx.h', 'src/evo/deterministicmns.cpp', 'src/evo/deterministicmns.h', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/llmq/blockprocessor.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/dkgsessionmgr.cpp', 'src/llmq/dkgsessionmgr.h', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 'src/llmq/signing_shares.h', 'src/llmq/utils.cpp', 'src/masternode/meta.cpp', 'src/masternode/payments.cpp', 'src/masternode/payments.h', 'src/masternode/utils.cpp', 'src/miner.cpp', 'src/net_processing.cpp', 'src/rpc/masternode.cpp', 'src/rpc/rpcevo.cpp', 'src/rpc/rpcquorums.cpp', 'src/spork.cpp', 'src/spork.h', 'src/test/setup_common.cpp', 'src/validation.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ], conflicts: [ 'src/validation.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ] }, { 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: [ 'configure.ac', 'src/chainparams.h', 'src/wallet/wallet.cpp' ] }, { number: 4956, files: [ 'src/evo/simplifiedmns.cpp', 'src/rpc/server.cpp', 'src/util/ranges.h', 'src/validatio
main
Potential conflicts detected!