backport: Merge bitcoin#26116, 28569, 27412, 19690 #6683
Annotations
3 warnings
check for potential conflicts
Potential conflicts detected!
|
check for potential conflicts
{
pull_number: 6683,
conflictPrs: [
{
number: 5943,
files: [
'src/Makefile.am',
'src/Makefile.test.include',
'src/governance/governance.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/signing.cpp',
'src/net.h',
'src/net_processing.cpp',
'src/net_processing.h',
'src/protocol.h',
'src/spork.cpp',
'src/spork.h',
'src/test/fuzz/txrequest.cpp',
'src/test/txrequest_tests.cpp',
'src/txrequest.cpp',
'src/txrequest.h',
'test/functional/p2p_tx_download.py'
],
conflicts: [ 'src/net.h', 'src/net_processing.cpp' ]
},
{
number: 5860,
files: [
'src/Makefile.test.include',
'src/bench/verify_script.cpp',
'src/chainparams.cpp',
'src/consensus/params.h',
'src/deploymentinfo.cpp',
'src/policy/policy.cpp',
'src/policy/policy.h',
'src/script/interpreter.cpp',
'src/script/interpreter.h',
'src/script/script_error.cpp',
'src/script/script_error.h',
'src/script/sign.cpp',
'src/test/checkdatasig_tests.cpp',
'src/test/data/sighash_dip0143.json',
'src/test/dip0020opcodes_tests.cpp',
'src/test/dip0143_tests.cpp',
'src/test/fuzz/eval_script.cpp',
'src/test/fuzz/signature_checker.cpp',
'src/test/script_tests.cpp',
'src/test/sighash_tests.cpp',
'src/validation.cpp',
'test/functional/feature_dip0143_activation.py',
'test/functional/test_framework/script.py',
'test/functional/test_runner.py'
],
conflicts: [ 'src/validation.cpp' ]
},
{
number: 6468,
files: [ 'src/net_processing.cpp' ],
conflicts: [ 'src/net_processing.cpp' ]
},
{
number: 6453,
files: [
'src/llmq/blockprocessor.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/commitment.cpp',
'src/llmq/debug.cpp',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/dkgsessionmgr.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/quorums.cpp',
'src/node/blockstorage.cpp',
'src/node/blockstorage.h',
'src/rpc/quorums.cpp',
'src/validation.cpp'
],
conflicts: [ 'src/validation.cpp' ]
},
{
number: 6473,
files: [ 'src/net.cpp', 'src/net.h' ],
conflicts: [ 'src/net.cpp', 'src/net.h' ]
},
{
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/net.cpp', 'src/net_processing.cpp', 'src/validation.cpp' ]
},
{
number: 6611,
files: [
'src/chain.h',
'src/consensus/params.h',
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
Loading