GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 86bf3ae3b5 into merged_master (Bitcoin PR #20202)

Browse source
This commit is contained in:
Andrew Poelstra 2021-05-07 17:19:00 +00:00
commit 0a5257d126
21 changed files with 129 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/wallet/scriptpubkeyman.cpp
View file

@ -3,12 +3,15 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <key_io.h>
#include <logging.h>
#include <outputtype.h>
#include <script/descriptor.h>
#include <script/sign.h>
#include <util/bip32.h>
#include <util/strencodings.h>
#include <util/string.h>
#include <util/system.h>
#include <util/time.h>
#include <util/translation.h>
#include <wallet/scriptpubkeyman.h>