backport: bitcoin#15202, #15768, #16432, #17597 (Qt dash core wallet improvements) #5796
Annotations
1 error and 3 warnings
validate potential conflicts
Process completed with exit code 1.
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
check for potential conflicts
{
pull_number: 5796,
conflictPrs: [
{
number: 4491,
files: [
'configure.ac',
'depends/packages/bls-dash.mk',
'src/bls/bls_worker.cpp',
'src/bls/bls_worker.h',
'src/coinjoin/client.cpp',
'src/coinjoin/coinjoin.cpp',
'src/coinjoin/coinjoin.h',
'src/coinjoin/server.cpp',
'src/evo/cbtx.cpp',
'src/evo/deterministicmns.h',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/commitment.cpp',
'src/llmq/dkgsession.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/quorums.cpp',
'src/llmq/signing_shares.cpp',
'src/masternode/utils.cpp',
'src/prevector.h',
'src/qt/guiutil.cpp',
'src/qt/guiutil.h',
'src/rpc/masternode.cpp',
'src/serialize.h',
'src/stacktraces.cpp',
'src/test/blockfilter_index_tests.cpp',
'src/test/blockfilter_tests.cpp',
'src/test/bloom_tests.cpp',
'src/test/flatfile_tests.cpp',
'src/test/netbase_tests.cpp',
'src/test/random_tests.cpp',
'src/test/streams_tests.cpp',
'src/test/util_tests.cpp',
'src/test/util_threadnames_tests.cpp',
'src/util/system.cpp',
'src/validation.cpp',
'src/validation.h',
'src/wallet/test/coinjoin_tests.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp'
],
conflicts: [ 'src/qt/guiutil.cpp', 'src/qt/guiutil.h' ]
},
{
number: 5513,
files: [
'ci/dash/build-docker.sh',
'ci/dash/build_depends.sh',
'ci/dash/build_src.sh',
'ci/dash/matrix.sh',
'ci/dash/push-docker.sh',
'ci/dash/test_integrationtests.sh',
'ci/dash/test_unittests.sh',
'contrib/auto_gdb/common_helpers.py',
'contrib/auto_gdb/dash_dbg.sh',
'contrib/auto_gdb/log_size.py',
'contrib/auto_gdb/simple_class_obj.py',
'contrib/auto_gdb/stl_containers.py',
'contrib/auto_gdb/used_size.py',
'contrib/containers/deploy/docker-entrypoint.sh',
'src/batchedlogger.cpp',
'src/batchedlogger.h',
'src/bench/bls_dkg.cpp',
'src/bench/ecdsa.cpp',
'src/bitcoin-cli.cpp',
'src/bls/bls.cpp',
'src/bls/bls.h',
'src/bls/bls_batchverifier.h',
'src/bls/bls_ies.cpp',
'src/bls/bls_worker.cpp',
'src/cachemap.h',
'src/cachemultimap.h',
'src/coinjoin/util.cpp',
'src/coinjoin/util.h',
'src/context.h',
'src/evo/cbtx.cpp',
'src/evo/cbtx.h',
'src/evo/deterministicmns.h',
'src/evo/dmnstate.cpp',
'src/evo/evodb.cpp',
'src/evo/evodb.h',
'src/evo/mnauth.h',
'src/evo/mnhftx.cpp',
'src/evo/mnhftx.h',
'src/evo/providertx.cpp',
'src/evo/providertx.h',
'src/evo/simplifiedmns.cpp',
'src/evo/simplifiedmns.h',
'src/evo/specialtx.cpp',
'src/evo/specialtx.h',
'src/evo/specialtxman.cpp',
'src/evo/specialtxman.h',
'src/flat-database.h',
'src/governance/classes.cpp',
'src/governance/classes.h',
'src/governance/governance.h',
'src/governance/object.h',
'src/governance/validators.cpp',
'src/governance/validators.h',
'src/governance/vote.h',
'src/hdchain.cpp',
'src/hdchain.h',
'src/llmq/blockprocessor.h',
'src/llmq/commitment.cpp',
'src/llmq/commitment.h',
'src/llmq/context.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/params.h',
'src/llmq/signing.cpp',
'src/llmq/signing.h',
'src/llmq/signing_shares.cpp',
'src/llmq/signin
|
check for potential conflicts
Potential conflicts detected!
|
The logs for this run have expired and are no longer available.
Loading