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 717fd58c4b into merged_master (Bitcoin PR #15625)

Browse source
This commit is contained in:
Andrew Poelstra 2020-10-28 00:10:51 +00:00
commit 756aebfdd2
1 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/wallet/rpcwallet.cpp
View file

@ -4276,19 +4276,6 @@ UniValue sethdseed(const JSONRPCRequest& request)
return NullUniValue;
}
void AddKeypathToMap(const CWallet* pwallet, const CKeyID& keyID, std::map<CPubKey, KeyOriginInfo>& hd_keypaths)
{
CPubKey vchPubKey;
if (!pwallet->GetPubKey(keyID, vchPubKey)) {
return;
}
KeyOriginInfo info;
if (!pwallet->GetKeyOrigin(keyID, info)) {
throw JSONRPCError(RPC_INTERNAL_ERROR, "Internal keypath is broken");
}
hd_keypaths.emplace(vchPubKey, std::move(info));
}
bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, int sighash_type, bool sign, bool bip32derivs)
{
LOCK(pwallet->cs_wallet);