backport: Merge bitcoin/bitcoin#23050 #6221
Closed
Annotations
4 warnings
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
check for potential conflicts
{
pull_number: 6221,
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/txmempool.cpp' ]
},
{
number: 5598,
files: [
'configure.ac',
'src/coinjoin/client.h',
'src/coinjoin/context.cpp',
'src/core_write.cpp',
'src/evo/deterministicmns.h',
'src/evo/dmn_types.h',
'src/llmq/context.cpp',
'src/node/coinstats.cpp',
'src/qt/networkstyle.cpp',
'src/script/interpreter.cpp',
'src/script/script.h',
'src/test/fuzz/string.cpp',
'src/txmempool.cpp'
],
conflicts: [ 'src/txmempool.cpp' ]
},
{
number: 6259,
files: [
'src/bench/mempool_stress.cpp',
'src/net_processing.cpp',
'src/test/fuzz/string.cpp',
'src/test/fuzz/tx_pool.cpp',
'src/test/getarg_tests.cpp',
'src/test/util_tests.cpp',
'src/txmempool.cpp',
'src/txmempool.h',
'src/util/strencodings.h',
'src/validation.cpp',
'src/validation.h',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/test_runner.py',
'test/functional/wallet_transactiontime_rescan.py',
'test/lint/lint-circular-dependencies.sh',
'test/lint/lint-locale-dependence.sh'
],
conflicts: [ 'src/txmempool.cpp' ]
},
{
number: 6099,
files: [
'doc/release-notes-23065.md',
'doc/release-process.md',
'src/interfaces/wallet.h',
'src/qt/coincontroldialog.cpp',
'src/rpc/client.cpp',
'src/txmempool.cpp',
'src/txmempool.h',
'src/validation.cpp',
'src/wallet/interfaces.cpp',
'src/wallet/rpcwallet.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'test/functional/mempool_updatefromblock.py',
'test/functional/wallet_basic.py'
],
conflicts: [ 'src/txmempool.cpp' ]
},
{
number: 6446,
files: [
'src/coinjoin/client.cpp',
'src/coinjoin/server.cpp',
'src/evo/assetlocktx.cpp',
'src/evo/cbtx.cpp',
'src/evo/deterministicmns.cpp',
'src/evo/deterministicmns.h',
'src/evo/mnauth.cpp',
'src/evo/mnhftx.cpp',
'src/evo/simplifiedmns.cpp',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/governance/vote.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/blockprocessor.h',
'src/llmq/ehf_signals.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/instantsend.h',
'src/llmq/quorums.cpp',
'src/llmq/quorums.h',
'src/llmq/signing.cpp',
'src/llmq/signing_shares.cpp',
'src/llmq/signing_shares.h',
'src/llmq/snapshot.cpp',
'src/llmq/utils.cpp',
'src/masternode/node.cpp',
'src/masternode/payments.cpp',
'src/net.cpp',
'src/net_processing.cpp',
'src/qt/masternodelist.cpp',
'src/qt/rpcconsole.cpp',
'src/rpc/evo.cpp',
'src/rpc/governance.cpp',
'src/rpc/masternode.cpp',
'src/rpc/quorums.cpp',
'src/test/evo_deterministicmns_tests.cpp',
'src/txmempool.cpp',
'src/validation.cpp'
],
conflicts: [ 'src/txmempool.cpp' ]
|
check for potential conflicts
Potential conflicts detected!
|
Loading