Skip to content

backport: merge bitcoin#21167, #22782, #21943, #22829, #24079, #24108, #24157, #25109 (network backports: part 5) #12516

backport: merge bitcoin#21167, #22782, #21943, #22829, #24079, #24108, #24157, #25109 (network backports: part 5)

backport: merge bitcoin#21167, #22782, #21943, #22829, #24079, #24108, #24157, #25109 (network backports: part 5) #12516

Triggered via pull request May 9, 2024 08:01
@kwvgkwvg
synchronize #6004
Status Failure
Total duration 44s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

1 error and 4 warnings
main
Process completed with exit code 1.
main
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 6004, conflictPrs: [ { number: 4465, files: [ 'src/governance/classes.h', 'src/governance/governance.cpp', 'src/governance/governance.h', 'src/governance/object.cpp', 'src/governance/object.h' ], conflicts: [ 'src/governance/governance.cpp', 'src/governance/governance.h' ] }, { number: 4686, files: [ 'configure.ac', 'depends/Makefile', 'depends/packages/packages.mk', 'depends/packages/qt.mk', 'src/bench/block_assemble.cpp', 'src/chainparams.cpp', 'src/chainparams.h', 'src/consensus/consensus.h', 'src/consensus/params.h', 'src/consensus/tx_verify.cpp', 'src/qt/paymentserver.cpp', 'src/qt/test/test_main.cpp', 'src/qt/transactiondesc.cpp', 'src/random.cpp', 'src/rpc/misc.cpp', 'src/txmempool.cpp', 'src/wallet/wallet.cpp', 'test/functional/feature_llmq_chainlocks.py', 'test/functional/test_framework/test_framework.py' ], conflicts: [ 'src/random.cpp' ] }, { number: 3495, files: [ 'src/net_processing.cpp', 'src/validation.h', 'src/version.h' ], conflicts: [ 'src/net_processing.cpp' ] }, { number: 5343, files: [ 'src/bls/bls.h', 'src/bls/bls_ies.cpp', 'src/coinjoin/coinjoin.cpp', 'src/coinjoin/coinjoin.h', 'src/dashbls/.gitignore', 'src/dashbls/CMakeLists.txt', 'src/dashbls/apple.rust.deps.sh', 'src/dashbls/apple.rust.sh', 'src/dashbls/apple.rust.single.sh', 'src/dashbls/emsdk_build.sh', 'src/dashbls/include/dashbls/elements.hpp', 'src/dashbls/include/dashbls/privatekey.hpp', 'src/dashbls/js-bindings/CMakeLists.txt', 'src/dashbls/js-bindings/blsjs.d.ts', 'src/dashbls/js-bindings/jsbindings.cpp', 'src/dashbls/js-bindings/wrappers/SchemeMPLWrapper.h', 'src/dashbls/python-impl/op_swu_g2.py', 'src/dashbls/rust-bindings/.gitignore', 'src/dashbls/rust-bindings/bls-dash-sys/.rustfmt.toml', 'src/dashbls/rust-bindings/bls-dash-sys/Cargo.toml', 'src/dashbls/rust-bindings/bls-dash-sys/bindings.rs', 'src/dashbls/rust-bindings/bls-dash-sys/build.rs', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/chaincode.cpp', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/chaincode.h', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.cpp', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.h', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.cpp', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.h', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/blschia.cpp', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/blschia.h', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/elements.cpp', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/elements.h', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/error.h', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/privatekey.cpp', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/privatekey.h', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/schemes.cpp', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/schemes.h', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/threshold.cpp', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/threshold.h', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/utils.cpp', 'src/dashbls/rust-bindings/bls-dash-sys/c-bindings/utils.hpp', 'src/dashbls/rust-bindings/bls-dash-sys/include.h', 'src/dashbls/rust-bindings/bls-dash-sys/src/lib.rs', 'src/dashbls/rust-bindings/bls-dash-sys/tests/sign_and_verify.rs', 'src/dashbls/rust-bindings/bls-signatures/.rustfmt.toml'
main
Potential conflicts detected!