backport: merge bitcoin#23065, #23498, #23557, #23736, #23855, #24403, #24968, #24933, #25358, #27823, #28253, #28612 (auxiliary backports: part 22) #6530
+597
−335
Annotations
4 warnings
|
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
|
check for potential conflicts
{
pull_number: 6530,
conflictPrs: [
{
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: [ 'configure.ac', 'src/txmempool.cpp', 'src/wallet/wallet.cpp' ]
},
{
number: 3362,
files: [
'src/qt/transactiontablemodel.cpp',
'src/qt/transactiontablemodel.h',
'src/qt/walletmodel.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h'
],
conflicts: [ 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ]
},
{
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',
'src/dashbls/rust-bindings/bls-signatures/Cargo.toml',
'src/dashbls/rust-bindings/bls-signatures/src/bip32/chain_code.rs',
'src/das
|
|
check for potential conflicts
Potential conflicts detected!
|
Loading