Skip to content

backport: bitcoin#18790, #19164, #19226, #19276, #19348, #19422, #19840, #20071, #20076, partial #19041 #10376

backport: bitcoin#18790, #19164, #19226, #19276, #19348, #19422, #19840, #20071, #20076, partial #19041

backport: bitcoin#18790, #19164, #19226, #19276, #19348, #19422, #19840, #20071, #20076, partial #19041 #10376

Triggered via pull request January 21, 2024 14:36
@knstknst
synchronize #5836
Status Success
Total duration 33s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

3 warnings
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 5836, conflictPrs: [ { number: 4927, files: [ 'src/coinjoin/client.cpp', 'src/coinjoin/coinjoin.cpp', 'src/coinjoin/coinjoin.h', 'src/coinjoin/server.cpp', 'src/coinjoin/server.h', 'src/dsnotificationinterface.cpp', 'src/dsnotificationinterface.h', 'src/evo/cbtx.cpp', 'src/evo/cbtx.h', 'src/evo/mnhftx.cpp', 'src/evo/mnhftx.h', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/evo/specialtxman.cpp', 'src/evo/specialtxman.h', 'src/init.cpp', 'src/interfaces/node.cpp', 'src/llmq/blockprocessor.h', 'src/llmq/chainlocks.cpp', 'src/llmq/chainlocks.h', 'src/llmq/debug.cpp', 'src/llmq/debug.h', 'src/llmq/dkgsession.cpp', 'src/llmq/dkgsession.h', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/dkgsessionhandler.h', 'src/llmq/dkgsessionmgr.cpp', 'src/llmq/dkgsessionmgr.h', 'src/llmq/init.cpp', 'src/llmq/init.h', 'src/llmq/instantsend.cpp', 'src/llmq/instantsend.h', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 'src/llmq/signing.cpp', 'src/llmq/signing.h', 'src/llmq/signing_shares.cpp', 'src/llmq/signing_shares.h', 'src/llmq/snapshot.cpp', 'src/llmq/snapshot.h', 'src/miner.cpp', 'src/miner.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/node/context.cpp', 'src/node/context.h', 'src/rpc/rpcquorums.cpp', 'src/test/block_reward_reallocation_tests.cpp', 'src/test/blockfilter_index_tests.cpp', 'src/test/dynamic_activation_thresholds_tests.cpp', 'src/test/miner_tests.cpp', 'src/test/util.cpp', 'src/test/util/setup_common.cpp', 'src/test/validation_block_tests.cpp' ], conflicts: [ 'src/init.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',
main
Potential conflicts detected!