mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

Support P2WPKH addresses in create/addmultisig

Browse Source
This commit is contained in:
Pieter Wuille 2017-11-30 16:48:49 -08:00
parent 3eaa003c88
commit 37c03d3e05
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpc/misc.cpp
View File

@ -280,12 +280,12 @@ CScript _createmultisig_redeemScript(CWallet * const pwallet, const UniValue& pa
// Case 1: Bitcoin address and we have full public key: // Case 1: Bitcoin address and we have full public key:
CTxDestination dest = DecodeDestination(ks); CTxDestination dest = DecodeDestination(ks);
if (pwallet && IsValidDestination(dest)) { if (pwallet && IsValidDestination(dest)) {
const CKeyID *keyID = boost::get<CKeyID>(&dest); CKeyID key = GetKeyForDestination(*pwallet, dest);
if (!keyID) { if (key.IsNull()) {
throw std::runtime_error(strprintf("%s does not refer to a key", ks)); throw std::runtime_error(strprintf("%s does not refer to a key", ks));
} }
CPubKey vchPubKey; CPubKey vchPubKey;
if (!pwallet->GetPubKey(*keyID, vchPubKey)) { if (!pwallet->GetPubKey(key, vchPubKey)) {
throw std::runtime_error(strprintf("no full public key for address %s", ks)); throw std::runtime_error(strprintf("no full public key for address %s", ks));
} }
if (!vchPubKey.IsFullyValid()) if (!vchPubKey.IsFullyValid())