fix: deduplicate QRINFO base blocks #25988
Triggered via pull request
June 9, 2026 00:49
thepastaclaw
opened
#7349
Status
Success
Total duration
5m 5s
Artifacts
–
predict-conflicts.yml
on: pull_request_target
predict_conflicts
22s
Annotations
3 warnings
|
predict_conflicts
Potential conflicts detected!
|
|
predict_conflicts
{
pull_number: 7349,
conflictPrs: [
{
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/llmq/snapshot.cpp' ]
},
{
number: 6965,
files: [
'src/Makefile.test.include',
'src/evo/cbtx.cpp',
'src/evo/creditpool.cpp',
'src/evo/mnhftx.cpp',
'src/instantsend/db.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/dkgsessionmgr.cpp',
'src/llmq/quorums.cpp',
'src/llmq/signing.cpp',
'src/llmq/snapshot.cpp',
'src/llmq/utils.cpp',
'src/masternode/meta.cpp',
'src/test/unordered_lru_cache_tests.cpp',
'src/unordered_lru_cache.h'
],
conflicts: [ 'src/llmq/snapshot.cpp' ]
}
]
}
|
|
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|