fix: only activate BIP44 descriptors for external signers #7076
Annotations
3 warnings
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7076,
conflictPrs: [
{
number: 3362,
files: [
'src/qt/transactiontablemodel.cpp',
'src/qt/transactiontablemodel.h',
'src/qt/walletmodel.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h'
],
conflicts: [ 'src/wallet/wallet.cpp' ]
},
{
number: 6182,
files: [
'src/governance/common.cpp',
'src/governance/common.h',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/governance/object.h',
'src/interfaces/node.h',
'src/rpc/governance.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/feature_governance.py',
'test/functional/feature_governance_cl.py',
'test/functional/feature_governance_objects.py',
'test/functional/interface_zmq_dash.py',
'test/functional/test_framework/governance.py',
'test/functional/test_framework/messages.py'
],
conflicts: [ 'src/wallet/wallet.cpp' ]
},
{
number: 7037,
files: [
'doc/release-notes-remove-rescan.md',
'src/dummywallet.cpp',
'src/init.cpp',
'src/wallet/init.cpp',
'src/wallet/rpc/backup.cpp',
'src/wallet/rpc/wallet.cpp',
'src/wallet/salvage.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'src/wallet/wallettool.cpp',
'test/functional/feature_notifications.py',
'test/functional/wallet_basic.py',
'test/functional/wallet_hd.py',
'test/functional/wallet_upgradetohd.py'
],
conflicts: [ 'src/wallet/wallet.cpp' ]
},
{
number: 7005,
files: [
'src/Makefile.test.include',
'src/coinjoin/client.cpp',
'src/interfaces/wallet.h',
'src/qt/overviewpage.cpp',
'src/util/system.cpp',
'src/util/system.h',
'src/wallet/init.cpp',
'src/wallet/interfaces.cpp',
'src/wallet/test/backup_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h'
],
conflicts: [ 'src/wallet/wallet.cpp' ]
},
{
number: 7049,
files: [
'ci/README.md',
'depends/description.md',
'doc/developer-notes.md',
'src/banman.cpp',
'src/banman.h',
'src/httpserver.cpp',
'src/init.cpp',
'src/init/common.cpp',
'src/logging.cpp',
'src/logging.h',
'src/net_processing.cpp',
'src/qt/bitcoin.cpp',
'src/qt/bitcoingui.cpp',
'src/qt/bitcoingui.h',
'src/qt/transactiontablemodel.cpp',
'src/qt/walletcontroller.cpp',
'src/qt/walletcontroller.h',
'src/rpc/request.cpp',
'src/rpc/server.cpp',
'src/test/fuzz/FuzzedDataProvider.h',
'src/test/logging_tests.cpp',
'src/test/orphanage_tests.cpp',
'src/test/script_tests.cpp',
'src/test/versionbits_tests.cpp',
'src/torcontrol.cpp',
'src/txmempool.h',
'src/wallet/db.h',
'src/wallet/dump.cpp',
'src/wallet/dump.h',
'src/wallet/scriptpubkeyman.cpp',
'src/wallet/scriptpubkeyman.h',
'src/wallet/spend.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/wallettool.cpp',
'test/functional/feature_filelock.py',
'test/functional/rpc_net.py',
'test/functional/test_framework/blockfilter.py',
'test/lint/lint-format-strings.py',
'test/lint/spelling.ignore-words.txt'
],
conflicts: [ 'src/wallet/wallet.cpp' ]
},
{
number: 7055,
files: [
'src/wallet/coincontrol.h',
'src/wallet/rpc/spend.cpp',
'src/wallet/spend.cpp',
'src/wallet/test/spend_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/rpc_fundrawtransaction.py',
'test/functional/rpc_ps
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
Loading