backport: Merge partial bitcoin#24203,22523,22739,13533 #8935
Triggered via pull request
November 20, 2023 05:22
vijaydasmp
synchronize
#5682
Status
Success
Total duration
30s
Artifacts
–
Annotations
3 warnings
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
main
{
pull_number: 5682,
conflictPrs: [
{
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.h',
'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/snapshot.cpp',
'src/llmq/snapshot.h',
'src/miner.cpp',
'src/miner.h',
'src/net_processing.cpp',
'src/net_processing.h',
'src/node/context.cpp',
'src/node/context.h',
'src/rpc/rpcquorums.cpp',
'src/test/block_reward_reallocation_tests.cpp',
'src/test/blockfilter_index_tests.cpp',
'src/test/dynamic_activation_thresholds_tests.cpp',
'src/test/miner_tests.cpp',
'src/test/util.cpp',
'src/test/util/setup_common.cpp',
'src/test/validation_block_tests.cpp'
],
conflicts: [ 'src/test/miner_tests.cpp' ]
},
{
number: 5152,
files: [
'doc/release-notes.md',
'src/init.cpp',
'src/logging.cpp',
'src/net.cpp',
'src/net.h',
'src/net_processing.cpp',
'src/net_processing.h',
'src/rpc/net.cpp',
'src/test/denialofservice_tests.cpp',
'src/validation.h',
'src/wallet/bdb.h',
'src/wallet/db.h',
'src/wallet/rpcwallet.cpp',
'src/wallet/scriptpubkeyman.h',
'src/wallet/wallet.h',
'test/functional/feature_proxy.py',
'test/functional/p2p_leak.py'
],
conflicts: [ 'doc/release-notes.md' ]
},
{
number: 5685,
files: [
'doc/release-notes/dash/release-notes-0.14.0.md',
'src/Makefile.am',
'src/bitcoin-cli.cpp',
'src/evo/mnauth.cpp',
'src/httpserver.cpp',
'src/init.cpp',
'src/llmq/signing.cpp',
'src/net.cpp',
'src/net_processing.cpp',
'src/node/interfaces.cpp',
'src/node/miner.cpp',
'src/node/miner.h',
'src/qt/intro.cpp',
'src/rpc/blockchain.cpp',
'src/rpc/mining.cpp',
'src/script/sigcache.cpp',
'src/test/block_reward_reallocation_tests.cpp',
'src/test/blockfilter_index_tests.cpp',
'src/test/dynamic_activation_thresholds_tests.cpp',
'src/test/fuzz/system.cpp',
'src/test/getarg_tests.cpp',
'src/test/miner_tests.cpp',
'src/test/util/mining.cpp',
'src/test/util/setup_common.cpp',
'src/test/util_tests.cpp',
'src/test/validation_block_tests.cpp',
'src/timedata.cpp',
'src/txdb.cpp',
'src/util/system.cpp',
'src/util/system.h',
'src/validation.cpp',
'src/wallet/bdb.cpp',
'src/wallet/init.cpp',
'src/wallet/scriptpubkeyman.cpp',
'src/wallet/wallet.cpp',
'src/zmq/zmqnotificationinterface.cpp'
],
conflicts: [ 'src/test/miner_tests.cpp' ]
}
]
}
|
main
Potential conflicts detected!
|