fix: restore BLS scheme after failed block validation#7345
Open
thepastaclaw wants to merge 4 commits into
Open
fix: restore BLS scheme after failed block validation#7345thepastaclaw wants to merge 4 commits into
thepastaclaw wants to merge 4 commits into
Annotations
3 warnings
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7345,
conflictPrs: [
{
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: 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/validation.cpp' ]
},
{
number: 7302,
files: [
'src/evo/deterministicmns.h',
'src/evo/dmnstate.h',
'src/evo/netinfo.cpp',
'src/evo/providertx.cpp',
'src/evo/providertx.h',
'src/evo/simplifiedmns.h',
'src/evo/smldiff.h',
'src/evo/specialtxman.cpp',
'src/evo/specialtxman.h',
'src/evo/types.h',
'src/llmq/commitment.cpp',
'src/rpc/evo.cpp',
'src/test/data/trivially_invalid.json',
'src/test/evo_trivialvalidation.cpp',
'src/validation.cpp',
'src/validation.h',
'test/lint/lint-circular-dependencies.py'
],
conflicts: [ 'src/validation.cpp' ]
},
{
number: 7335,
files: [
'src/chain.h',
'src/index/coinstatsindex.cpp',
'src/index/coinstatsindex.h',
'src/kernel/coinstats.h',
'src/rpc/blockchain.cpp',
'src/validation.cpp',
'src/validation.h',
'test/functional/feature_coinstatsindex.py'
],
conflicts: [ 'src/validation.cpp' ]
},
{
number: 7320,
files: [
'src/Makefile.am',
'src/Makefile.test.include',
'src/chain.cpp',
'src/chain.h',
'src/consensus/validation.h',
'src/headerssync.cpp',
'src/headerssync.h',
'src/index/base.cpp',
'src/interfaces/node.h',
'src/net_processing.cpp',
'src/net_processing.h',
'src/node/interface_ui.cpp',
'src/node/interface_ui.h',
'src/node/interfaces.cpp',
'src/pow.cpp',
'src/pow.h',
'src/primitives/block.h',
'src/qt/bitcoin.cpp',
'src/qt/bitcoingui.cpp',
'src/qt/bitcoingui.h',
'src/qt/clientmodel.cpp',
'src/qt/clientmodel.h',
'src/qt/informationwidget.cpp',
'src/qt/informationwidget.h',
'src/qt/modaloverlay.cpp',
'src/qt/modaloverlay.h',
'src/qt/rpcconsole.cpp',
'src/qt/rpcconsole.h',
'src/qt/sendcoinsdialog.cpp',
'src/qt/sendcoinsdialog.h',
'src/rpc/mining.cpp',
'src/rpc/net.cpp',
'src/test/blockfilter_inde
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
background
wait
wait-all
cancel
parallel
Loading