backport: bitcoin/bitcoin#24118: Add 'sendall' RPC née sweep and related backports #7131
Annotations
3 warnings
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7131,
conflictPrs: [
{
number: 5799,
files: [
'src/bloom.cpp',
'src/bloom.h',
'src/chainparams.cpp',
'src/consensus/params.h',
'src/deploymentinfo.cpp',
'src/evo/deterministicmns.cpp',
'src/evo/dmnstate.cpp',
'src/evo/dmnstate.h',
'src/evo/providertx.cpp',
'src/evo/providertx.h',
'src/evo/simplifiedmns.cpp',
'src/evo/simplifiedmns.h',
'src/llmq/ehf_signals.cpp',
'src/masternode/payments.cpp',
'src/qt/masternodelist.cpp',
'src/rpc/blockchain.cpp',
'src/rpc/evo.cpp',
'src/rpc/masternode.cpp',
'src/test/block_reward_reallocation_tests.cpp',
'src/test/data/trivially_invalid.json',
'src/test/data/trivially_valid.json',
'src/test/evo_deterministicmns_tests.cpp',
'src/test/evo_trivialvalidation.cpp',
'test/functional/feature_dip0026.py',
'test/functional/feature_dip3_deterministicmns.py',
'test/functional/feature_llmq_evo.py',
'test/functional/rpc_blockchain.py',
'test/functional/rpc_masternode.py',
'test/functional/test_framework/test_framework.py',
'test/functional/test_runner.py'
],
conflicts: [ 'test/functional/test_runner.py' ]
},
{
number: 5860,
files: [
'src/Makefile.test.include',
'src/bench/verify_script.cpp',
'src/chainparams.cpp',
'src/consensus/params.h',
'src/deploymentinfo.cpp',
'src/policy/policy.cpp',
'src/policy/policy.h',
'src/script/interpreter.cpp',
'src/script/interpreter.h',
'src/script/script_error.cpp',
'src/script/script_error.h',
'src/script/sign.cpp',
'src/test/checkdatasig_tests.cpp',
'src/test/data/sighash_dip0143.json',
'src/test/dip0020opcodes_tests.cpp',
'src/test/dip0143_tests.cpp',
'src/test/fuzz/eval_script.cpp',
'src/test/fuzz/signature_checker.cpp',
'src/test/script_tests.cpp',
'src/test/sighash_tests.cpp',
'src/validation.cpp',
'test/functional/feature_dip0143_activation.py',
'test/functional/test_framework/script.py',
'test/functional/test_runner.py'
],
conflicts: [ 'test/functional/test_runner.py' ]
},
{
number: 6236,
files: [
'src/Makefile.test.include',
'src/Makefile.test_util.include',
'src/evo/cbtx.cpp',
'src/evo/cbtx.h',
'src/evo/simplifiedmns.cpp',
'src/evo/specialtxman.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/utils.cpp',
'src/node/miner.cpp',
'src/rpc/rawtransaction.cpp',
'src/test/llmq_chainlock_tests.cpp',
'src/test/util/llmq_tests.h',
'test/functional/feature_llmq_chainlocks_automatic.py',
'test/functional/feature_llmq_singlenode.py',
'test/functional/test_framework/test_framework.py',
'test/functional/test_runner.py'
],
conflicts: [ 'test/functional/test_runner.py' ]
},
{
number: 7090,
files: [
'ci/dash/test_integrationtests.sh',
'configure.ac',
'contrib/debian/copyright',
'doc/build-windows.md',
'doc/fuzzing.md',
'doc/managing-wallets.md',
'src/.clang-tidy',
'src/addrman.cpp',
'src/bitcoin-cli.cpp',
'src/bitcoin-util.cpp',
'src/instantsend/instantsend.cpp',
'src/interfaces/chain.h',
'src/net_processing.cpp',
'src/node/interfaces.cpp',
'src/rpc/util.cpp',
'src/test/fuzz/tx_pool.cpp',
'src/test/fuzz/txorphan.cpp',
'src/test/util/setup_common.cpp',
'src/validation.cpp',
'src/wallet/rpc/util.cpp',
'src/wallet/rpc/wallet.cpp',
'src/wallet/test/coinselector_tests.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/wallet_multiwallet.py'
],
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
Loading