backport: Merge bitcoin#24237, 23631 #15905
Triggered via pull request
November 24, 2024 15:32
vijaydasmp
synchronize
#6309
Status
Success
Total duration
37s
Artifacts
–
predict-conflicts.yml
on: pull_request_target
predict_conflicts
29s
Annotations
4 warnings
predict_conflicts
The following actions use a deprecated Node.js version and will be forced to run on node20: actions/checkout@v3. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
|
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
predict_conflicts
{
pull_number: 6309,
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_processing.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/net_processing.cpp' ]
},
{
number: 6425,
files: [
'src/llmq/context.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/instantsend.h',
'src/net_processing.cpp',
'src/net_processing.h'
],
conflicts: [ 'src/net_processing.cpp' ]
},
{
number: 6427,
files: [ 'src/net_processing.cpp', 'src/net_processing.h' ],
conflicts: [ 'src/net_processing.cpp' ]
},
{
number: 6426,
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/net_processing.cpp',
'src/net_processing.h'
],
conflicts: [ 'src/net_processing.cpp' ]
},
{
number: 6399,
files: [
'ci/test/00_setup_env_native_tsan.sh',
'configure.ac',
'doc/developer-notes.md',
'src/batchedlogger.cpp',
'src/batchedlogger.h',
'src/dbwrapper.cpp',
'src/evo/creditpool.h',
'src/httpserver.cpp',
'src/init.cpp',
'src/init/common.cpp',
'src/init/common.h',
'src/llmq/commitment.cpp',
'src/llmq/dkgsession.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/quorums.h',
'src/llmq/signing_shares.cpp',
'src/llmq/utils.cpp',
'src/logging.cpp',
'src/logging.h',
'src/net.cpp',
'src/net.h',
'src/net_processing.cpp',
'src/node/blockstorage.cpp',
'src/node/txreconciliation.cpp',
'src/qt/coincontroldialog.cpp',
'src/stats/rawsender.cpp',
'src/sync.cpp',
'src/sync.h',
'src/test/checkqueue_tests.cpp',
'src/test/i2p_tests.cpp',
'src/test/logging_tests.cpp',
'src/test/util/setup_common.cpp',
'src/timedata.cpp',
'src/util/system.cpp',
'src/util/system.h',
'src/validation.cpp',
'src/wallet/coinselection.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/feature_config_args.py',
'test/functional/rpc_misc.py',
'test/functional/test_framework/test_node.py',
'test/lint/lint-format-strings.sh',
'test/lint/lint-logs.sh'
],
conflicts: [ 'src/net_processing.cpp' ]
},
{
number: 6300,
files: [
'src/bitcoin-tx.cpp',
'src/common/bloom.cpp',
'src/qt/bitcoin.cpp',
'src/qt/clientmodel.cpp',
'src/qt/guiconstants.h',
'src/qt/op
|
predict_conflicts
Potential conflicts detected!
|