Merge 54f812d9d2 into merged_master (Bitcoin PR #18673)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:23 +00:00
commit fd37b7c5d6
323 changed files with 446 additions and 438 deletions

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011-2019 The Bitcoin Core developers
// Copyright (c) 2011-2020 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -6,16 +6,16 @@
#include <core_io.h>
#include <key.h>
#include <rpc/util.h>
#include <script/script.h>
#include <script/script_error.h>
#include <script/sign.h>
#include <script/signingprovider.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <test/util/transaction_utils.h>
#include <test/util/setup_common.h>
#include <rpc/util.h>
#include <streams.h>
#include <test/util/setup_common.h>
#include <test/util/transaction_utils.h>
#include <util/strencodings.h>
#include <util/system.h>
#if defined(HAVE_CONSENSUS_LIB)
#include <script/bitcoinconsensus.h>