Skip to content

refactor: move CInstantSendManager::AskNodesForLockedTx into PeerManager #16042

refactor: move CInstantSendManager::AskNodesForLockedTx into PeerManager

refactor: move CInstantSendManager::AskNodesForLockedTx into PeerManager #16042

Triggered via pull request December 3, 2024 15:33
@PastaPastaPastaPastaPastaPasta
synchronize #6425
Status Success
Total duration 29s
Artifacts

predict-conflicts.yml

on: pull_request_target
predict_conflicts
20s
predict_conflicts
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
predict_conflicts
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
predict_conflicts
{ pull_number: 6425, 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/llmq/instantsend.cpp', 'src/net_processing.cpp', 'src/net_processing.h' ] }, { 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/llmq/context.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: 6418, files: [ 'src/llmq/ehf_signals.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 'src/llmq/signing.cpp', 'src/rpc/quorums.cpp' ], conflicts: [ 'src/llmq/instantsend.cpp' ] }, { number: 6237, files: [ 'src/evo/deterministicmns.cpp', 'src/init.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/instantsend.h', 'src/validation.cpp' ], conflicts: [ 'src/llmq/instantsend.cpp', 'src/llmq/instantsend.h' ] }, { number: 6439, files: [ 'contrib/guix/guix-build', 'doc/README.md', 'doc/developer-notes.md', 'doc/p2p-bad-ports.md', 'src/init.cpp', 'src/net.cpp', 'src/net_processing.cpp', 'src/netaddress.cpp', 'src/netaddress.h', 'src/netbase.cpp', 'src/netbase.h', 'src/qt/bitcoin.cpp', 'src/qt/intro.cpp', 'src/rpc/misc.cpp', 'src/rpc/rawtransaction.cpp', 'src/test/fuzz/netaddress.cpp', 'src/test/netbase_tests.cpp', 'src/test/util_tests.cpp', 'src/txdb.cpp', 'src/wallet/rpcdump.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'test/functional/feature_txindex_compatibility.py', 'test/functional/rpc_decodescript.py', 'test/functional/rpc_uptime.py', 'test/functional/wallet_encryption.py', 'test/functional/wallet_importdescriptors.py', 'test/util/bitcoin-util-test.py' ], conflicts: [ 'src/net_processing.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/deterministi
predict_conflicts
Potential conflicts detected!