backport: bitcoin#19522, #19809, #20993, #21075, #21126, #21138, #21221, #21354, #21542 #12181
Annotations
1 error and 4 warnings
validate potential conflicts
Process completed with exit code 1.
|
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/.
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
check for potential conflicts
{
pull_number: 5974,
conflictPrs: [
{
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/llmq/dkgsession.cpp' ]
},
{
number: 4631,
files: [
'src/llmq/blockprocessor.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/commitment.h',
'src/llmq/dkgsession.cpp',
'src/llmq/dkgsession.h',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/dkgsessionmgr.cpp',
'src/llmq/instantsend.cpp',
'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/utils.cpp',
'src/llmq/utils.h'
],
conflicts: [ 'src/llmq/dkgsession.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: [ 'configure.ac' ]
},
{
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.
|
check for potential conflicts
Potential conflicts detected!
|
Loading