Skip to content

backport: bitcoin#23590, 23061, 23694 #15217

backport: bitcoin#23590, 23061, 23694

backport: bitcoin#23590, 23061, 23694 #15217

Triggered via pull request October 17, 2024 15:01
@vijaydasmpvijaydasmp
synchronize #6256
Status Success
Total duration 39s
Artifacts

predict-conflicts.yml

on: pull_request_target
predict_conflicts
30s
predict_conflicts
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
predict_conflicts
The following actions use a deprecated Node.js version and will be forced to run on node20: actions/checkout@v3. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
predict_conflicts
{ pull_number: 6256, 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: [ 'src/rpc/blockchain.cpp' ] }, { 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: [ 'src/validation.cpp' ] }, { number: 6237, files: [ 'src/evo/deterministicmns.cpp', 'src/init.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/instantsend.h', 'src/validation.cpp' ], conflicts: [ 'src/validation.cpp' ] }, { number: 6259, files: [ 'src/bench/mempool_stress.cpp', 'src/net_processing.cpp', 'src/test/fuzz/string.cpp', 'src/test/fuzz/tx_pool.cpp', 'src/test/getarg_tests.cpp', 'src/test/util_tests.cpp', 'src/txmempool.cpp', 'src/txmempool.h', 'src/util/strencodings.h', 'src/validation.cpp', 'src/validation.h', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'test/functional/test_runner.py', 'test/functional/wallet_transactiontime_rescan.py', 'test/lint/lint-circular-dependencies.sh', 'test/lint/lint-locale-dependence.sh' ], conflicts: [ 'src/validation.cpp' ] }, { number: 6224, files: [ 'src/validation.cpp' ], conflicts: [ 'src/validation.cpp' ] }, { number: 6221, files: [ 'src/index/base.h', 'src/index/txindex.cpp', 'src/index/txindex.h', 'src/init.cpp', 'src/miner.cpp', 'src/txdb.cpp', 'src/txdb.h', 'src/txmempool.cpp', 'src/validation.cpp', 'src/validation.h' ], conflicts: [ 'src/validation.cpp' ] }, { number: 6327, files: [ 'src/Makefile.bench.include', 'src/Makefile.test.include', 'src/bench/block_assemble.cpp', 'src/bench/gcs_filter.cpp', 'src/bench/load_exter
predict_conflicts
Potential conflicts detected!