backport: Merge bitcoin#20466,14604,15710,17458,18722,(partial) 17934 #8763
Triggered via pull request
November 13, 2023 16:41
vijaydasmp
synchronize
#5681
Status
Failure
Total duration
48s
Artifacts
–
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: 5681,
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: [ 'src/wallet/wallet.cpp' ]
},
{
number: 4491,
files: [
'configure.ac',
'depends/packages/bls-dash.mk',
'src/bls/bls_worker.cpp',
'src/bls/bls_worker.h',
'src/coinjoin/client.cpp',
'src/coinjoin/coinjoin.cpp',
'src/coinjoin/coinjoin.h',
'src/coinjoin/server.cpp',
'src/evo/cbtx.cpp',
'src/evo/deterministicmns.h',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/commitment.cpp',
'src/llmq/dkgsession.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/quorums.cpp',
'src/llmq/signing_shares.cpp',
'src/masternode/utils.cpp',
'src/prevector.h',
'src/qt/guiutil.cpp',
'src/qt/guiutil.h',
'src/rpc/masternode.cpp',
'src/serialize.h',
'src/stacktraces.cpp',
'src/test/blockfilter_index_tests.cpp',
'src/test/blockfilter_tests.cpp',
'src/test/bloom_tests.cpp',
'src/test/flatfile_tests.cpp',
'src/test/netbase_tests.cpp',
'src/test/random_tests.cpp',
'src/test/streams_tests.cpp',
'src/test/util_tests.cpp',
'src/test/util_threadnames_tests.cpp',
'src/util/system.cpp',
'src/validation.cpp',
'src/validation.h',
'src/wallet/test/coinjoin_tests.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp'
],
conflicts: [ 'src/wallet/wallet.cpp' ]
},
{
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/wallet/wallet.cpp' ]
},
{
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/coi
|
main
Potential conflicts detected!
|