Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'bitcoin/master' into btc-master
Conflicts: .cirrus.yml Makefile.am build_msvc/bitcoin-qt/bitcoin-qt.vcxproj build_msvc/common.init.vcxproj.in build_msvc/libtest_util/libtest_util.vcxproj.in build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj ci/test/00_setup_env_android.sh ci/test/00_setup_env_arm.sh ci/test/00_setup_env_i686_centos.sh ci/test/00_setup_env_i686_multiprocess.sh ci/test/00_setup_env_mac.sh ci/test/00_setup_env_native.sh ci/test/00_setup_env_native_asan.sh ci/test/00_setup_env_native_fuzz.sh ci/test/00_setup_env_native_fuzz_with_msan.sh ci/test/00_setup_env_native_fuzz_with_valgrind.sh ci/test/00_setup_env_native_msan.sh ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh ci/test/00_setup_env_native_tidy.sh ci/test/00_setup_env_native_tsan.sh ci/test/00_setup_env_native_valgrind.sh ci/test/00_setup_env_win64.sh ci/test/04_install.sh ci/test/06_script_a.sh ci/test/06_script_b.sh configure.ac contrib/macdeploy/macdeployqtplus depends/packages/qt.mk doc/build-unix.md doc/design/assumeutxo.md doc/fuzzing.md doc/reduce-memory.md doc/release-process.md share/qt/Info.plist.in src/.bear-tidy-config src/Makefile.am src/Makefile.bench.include src/Makefile.qt.include src/Makefile.qt_locale.include src/Makefile.test.include src/bench/mempool_eviction.cpp src/bench/mempool_stress.cpp src/bench/rpc_mempool.cpp src/bitcoind.cpp src/coins.cpp src/coins.h src/core_io.h src/core_write.cpp src/crypto/muhash.cpp src/init.cpp src/kernel/mempool_entry.h src/key_io.h src/logging.cpp src/logging.h src/net_processing.cpp src/node/interfaces.cpp src/primitives/transaction.cpp src/primitives/transaction.h src/protocol.cpp src/qt/addressbookpage.cpp src/qt/addressbookpage.h src/qt/addresstablemodel.cpp src/qt/addresstablemodel.h src/qt/android/gradle.properties src/qt/askpassphrasedialog.cpp src/qt/bitcoin.cpp src/qt/bitcoin.h src/qt/bitcoin_locale.qrc src/qt/bitcoingui.cpp src/qt/bitcoingui.h src/qt/bitcoinstrings.cpp src/qt/clientmodel.cpp src/qt/coincontroldialog.cpp src/qt/coincontroldialog.h src/qt/createwalletdialog.cpp src/qt/createwalletdialog.h src/qt/forms/coincontroldialog.ui src/qt/forms/createwalletdialog.ui src/qt/forms/debugwindow.ui src/qt/forms/sendcoinsdialog.ui src/qt/guiutil.cpp src/qt/locale/bitcoin_am.ts src/qt/locale/bitcoin_ar.ts src/qt/locale/bitcoin_az.ts src/qt/locale/bitcoin_be.ts src/qt/locale/bitcoin_bg.ts src/qt/locale/bitcoin_bn.ts src/qt/locale/bitcoin_bs.ts src/qt/locale/bitcoin_ca.ts src/qt/locale/bitcoin_cs.ts src/qt/locale/bitcoin_da.ts src/qt/locale/bitcoin_de.ts src/qt/locale/bitcoin_el.ts src/qt/locale/bitcoin_en.ts src/qt/locale/bitcoin_en.xlf src/qt/locale/bitcoin_eo.ts src/qt/locale/bitcoin_es.ts src/qt/locale/bitcoin_es_CL.ts src/qt/locale/bitcoin_es_CO.ts src/qt/locale/bitcoin_es_DO.ts src/qt/locale/bitcoin_es_MX.ts src/qt/locale/bitcoin_es_VE.ts src/qt/locale/bitcoin_et.ts src/qt/locale/bitcoin_eu.ts src/qt/locale/bitcoin_fa.ts src/qt/locale/bitcoin_fi.ts src/qt/locale/bitcoin_fil.ts src/qt/locale/bitcoin_fr.ts src/qt/locale/bitcoin_ga.ts src/qt/locale/bitcoin_gl.ts src/qt/locale/bitcoin_gl_ES.ts src/qt/locale/bitcoin_gu.ts src/qt/locale/bitcoin_ha.ts src/qt/locale/bitcoin_he.ts src/qt/locale/bitcoin_hr.ts src/qt/locale/bitcoin_hu.ts src/qt/locale/bitcoin_id.ts src/qt/locale/bitcoin_is.ts src/qt/locale/bitcoin_it.ts src/qt/locale/bitcoin_ja.ts src/qt/locale/bitcoin_ka.ts src/qt/locale/bitcoin_kk.ts src/qt/locale/bitcoin_km.ts src/qt/locale/bitcoin_ko.ts src/qt/locale/bitcoin_ku.ts src/qt/locale/bitcoin_ku_IQ.ts src/qt/locale/bitcoin_la.ts src/qt/locale/bitcoin_lt.ts src/qt/locale/bitcoin_lv.ts src/qt/locale/bitcoin_ml.ts src/qt/locale/bitcoin_mn.ts src/qt/locale/bitcoin_mr_IN.ts src/qt/locale/bitcoin_ms.ts src/qt/locale/bitcoin_nb.ts src/qt/locale/bitcoin_ne.ts src/qt/locale/bitcoin_nl.ts src/qt/locale/bitcoin_pa.ts src/qt/locale/bitcoin_pam.ts src/qt/locale/bitcoin_pl.ts src/qt/locale/bitcoin_pt.ts src/qt/locale/bitcoin_pt_BR.ts src/qt/locale/bitcoin_ro.ts src/qt/locale/bitcoin_ru.ts src/qt/locale/bitcoin_si.ts src/qt/locale/bitcoin_sk.ts src/qt/locale/bitcoin_sl.ts src/qt/locale/bitcoin_sq.ts src/qt/locale/bitcoin_sr.ts src/qt/locale/[email protected] src/qt/locale/bitcoin_sv.ts src/qt/locale/bitcoin_sw.ts src/qt/locale/bitcoin_szl.ts src/qt/locale/bitcoin_ta.ts src/qt/locale/bitcoin_te.ts src/qt/locale/bitcoin_th.ts src/qt/locale/bitcoin_tk.ts src/qt/locale/bitcoin_tl.ts src/qt/locale/bitcoin_tr.ts src/qt/locale/bitcoin_ug.ts src/qt/locale/bitcoin_uk.ts src/qt/locale/bitcoin_ur.ts src/qt/locale/bitcoin_uz.ts src/qt/locale/[email protected] src/qt/locale/[email protected] src/qt/locale/bitcoin_vi.ts src/qt/locale/bitcoin_zh-Hans.ts src/qt/locale/bitcoin_zh.ts src/qt/locale/bitcoin_zh_CN.ts src/qt/locale/bitcoin_zh_HK.ts src/qt/locale/bitcoin_zh_TW.ts src/qt/locale/bitcoin_zu.ts src/qt/optionsdialog.cpp src/qt/optionsmodel.cpp src/qt/paymentserver.h src/qt/psbtoperationsdialog.cpp src/qt/psbtoperationsdialog.h src/qt/rpcconsole.cpp src/qt/rpcconsole.h src/qt/sendcoinsdialog.cpp src/qt/sendcoinsdialog.h src/qt/splashscreen.cpp src/qt/test/addressbooktests.cpp src/qt/test/apptests.cpp src/qt/test/optiontests.cpp src/qt/test/optiontests.h src/qt/test/rpcnestedtests.cpp src/qt/test/test_main.cpp src/qt/test/uritests.cpp src/qt/test/util.cpp src/qt/test/util.h src/qt/test/wallettests.cpp src/qt/transactiondesc.cpp src/qt/transactionrecord.cpp src/qt/transactionrecord.h src/qt/transactiontablemodel.cpp src/qt/transactionview.cpp src/qt/walletcontroller.cpp src/qt/walletcontroller.h src/qt/walletmodel.cpp src/qt/walletmodel.h src/qt/winshutdownmonitor.cpp src/rpc/client.cpp src/rpc/rawtransaction.cpp src/script/standard.cpp src/script/standard.h src/test/fuzz/process_message.cpp src/test/fuzz/util.cpp src/test/fuzz/util.h src/test/fuzz/util/mempool.cpp src/test/hash_tests.cpp src/test/rpc_tests.cpp src/test/script_tests.cpp src/test/sighash_tests.cpp src/test/util/setup_common.cpp src/test/util/setup_common.h src/test/util/txmempool.cpp src/validation.cpp src/wallet/rpc/addresses.cpp src/wallet/scriptpubkeyman.h src/wallet/test/wallet_tests.cpp src/wallet/test/walletload_tests.cpp src/wallet/wallet.cpp src/wallet/wallet.h src/wallet/walletdb.cpp src/wallet/walletdb.h test/functional/feature_config_args.py test/functional/feature_filelock.py test/functional/feature_includeconf.py test/functional/feature_settings.py test/functional/feature_syscall_sandbox.py test/functional/rpc_psbt.py test/functional/rpc_users.py test/functional/rpc_whitelist.py test/functional/test-shell.md test/functional/test_framework/test_framework.py test/functional/test_framework/test_node.py test/functional/test_runner.py test/functional/tool_wallet.py test/functional/wallet_backwards_compatibility.py test/functional/wallet_fundrawtransaction.py test/lint/lint-circular-dependencies.py test/lint/lint-format-strings.py test/lint/lint-includes.py test/lint/lint-python.py test/lint/lint-shell.py
- Loading branch information