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

Merge f5000ae66c into merged_master (Bitcoin PR #19555)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 14:11:14 +00:00
commit f36832a9dd
1 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/rpc/rawtransaction.cpp
View file

@ -35,6 +35,7 @@
#include <script/signingprovider.h>
#include <script/standard.h>
#include <uint256.h>
#include <util/bip32.h>
#include <util/moneystr.h>
#include <util/rbf.h>
#include <util/strencodings.h>
@ -992,25 +993,6 @@ static UniValue testmempoolaccept(const JSONRPCRequest& request)
return result;
}
static std::string WriteHDKeypath(std::vector<uint32_t>& keypath)
{
std::string keypath_str = "m";
for (uint32_t num : keypath) {
keypath_str += "/";
bool hardened = false;
if (num & 0x80000000) {
hardened = true;
num &= ~0x80000000;
}
keypath_str += ToString(num);
if (hardened) {
keypath_str += "'";
}
}
return keypath_str;
}
UniValue blindpsbt(const JSONRPCRequest& request)
{
if (!g_con_elementsmode)