backport: bitcoin#25670, #22270, #22150, #20938, #20939, #20913, bitcoin-core/gui#409, partial: bitcoin#18267, #19937, #19993, #20014, #20035, #20830, #20917, #20923, #21384, #24424, #24559, #25625 (DNM signet) #7054
Annotations
2 errors and 3 warnings
|
Fail if conflicts exist
Process completed with exit code 1.
|
|
validate potential conflicts
Process completed with exit code 1.
|
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7054,
conflictPrs: [
{
number: 6595,
files: [
'src/init.cpp',
'src/net_processing.cpp',
'src/qt/test/wallettests.cpp',
'src/rest.cpp',
'src/test/interfaces_tests.cpp',
'src/test/validation_block_tests.cpp',
'src/test/validation_chainstatemanager_tests.cpp',
'src/txorphanage.cpp',
'src/txorphanage.h',
'src/validation.h',
'src/wallet/rpcwallet.cpp',
'src/wallet/test/spend_tests.cpp',
'src/wallet/test/wallet_tests.cpp'
],
conflicts: [ 'src/init.cpp' ]
},
{
number: 6713,
files: [
'src/interfaces/wallet.h',
'src/qt/walletcontroller.cpp',
'src/wallet/interfaces.cpp',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'test/functional/p2p_invalid_messages.py',
'test/functional/p2p_leak_tx.py'
],
conflicts: [ 'src/qt/walletcontroller.cpp' ]
},
{
number: 6714,
files: [
'src/bench/coin_selection.cpp',
'src/bench/wallet_balance.cpp',
'src/bitcoin-wallet.cpp',
'src/bitcoind.cpp',
'src/chain.cpp',
'src/dummywallet.cpp',
'src/index/base.cpp',
'src/index/blockfilterindex.cpp',
'src/index/coinstatsindex.cpp',
'src/index/coinstatsindex.h',
'src/index/txindex.cpp',
'src/init.cpp',
'src/init.h',
'src/init/bitcoin-node.cpp',
'src/init/bitcoind.cpp',
'src/interfaces/chain.h',
'src/interfaces/init.h',
'src/interfaces/node.h',
'src/interfaces/wallet.h',
'src/net_processing.cpp',
'src/node/blockstorage.cpp',
'src/node/blockstorage.h',
'src/node/caches.cpp',
'src/node/caches.h',
'src/node/chainstate.cpp',
'src/node/chainstate.h',
'src/node/coin.cpp',
'src/node/coin.h',
'src/node/coinstats.cpp',
'src/node/coinstats.h',
'src/node/context.cpp',
'src/node/context.h',
'src/node/interfaces.cpp',
'src/node/miner.cpp',
'src/node/miner.h',
'src/node/minisketchwrapper.cpp',
'src/node/minisketchwrapper.h',
'src/node/psbt.cpp',
'src/node/psbt.h',
'src/node/transaction.cpp',
'src/node/transaction.h',
'src/node/utxo_snapshot.h',
'src/qt/bitcoin.cpp',
'src/qt/coincontroldialog.cpp',
'src/qt/coincontroldialog.h',
'src/qt/psbtoperationsdialog.cpp',
'src/qt/sendcoinsdialog.cpp',
'src/qt/sendcoinsdialog.h',
'src/qt/test/addressbooktests.cpp',
'src/qt/test/test_main.cpp',
'src/qt/test/wallettests.cpp',
'src/qt/transactiondesc.cpp',
'src/qt/transactionrecord.cpp',
'src/qt/walletcontroller.cpp',
'src/qt/walletmodel.cpp',
'src/qt/walletmodel.h',
'src/rest.cpp',
'src/rpc/blockchain.cpp',
'src/rpc/blockchain.h',
'src/rpc/mining.cpp',
'src/rpc/misc.cpp',
'src/rpc/net.cpp',
'src/rpc/rawtransaction.cpp',
'src/rpc/server_util.cpp',
'src/rpc/server_util.h',
'src/test/blockfilter_index_tests.cpp',
'src/test/coinstatsindex_tests.cpp',
'src/test/fuzz/coins_view.cpp',
'src/test/fuzz/deserialize.cpp',
'src/test/fuzz/minisketch.cpp',
'src/test/fuzz/psbt.cpp',
'src/test/fuzz/tx_pool.cpp',
'src/test/fuzz/utxo_snapshot.cpp',
'src/test/miner_tests.cpp',
'src/test/minisketch_tests.cpp',
'src/test/util/blockfilter.cpp',
'src/test/util/chainstate.h',
'src/test/util/mining.cpp',
'src/test/util/mining.h',
'src/test/util/setup_common.cpp',
'src/test/util/setup_common.h',
'src/test/util/wallet.cpp',
'src/test/util/wallet.h',
'src/test/validation_block_tests.cpp',
'src/test/validation_chainstatemanager_tests.cpp',
'src/test/validation_flush_tests.cpp',
's
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
Loading