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

MERGE-FIX: Fix upstream functional tests

Browse source
This commit is contained in:
Steven Roose 2019-05-02 16:51:55 +01:00
parent 71723f794f
commit 3a8398024f
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/rpcdump.cpp
View file

@ -965,7 +965,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
} }
// (P2SH-)P2PK/P2PKH/P2WPKH // (P2SH-)P2PK/P2PKH/P2WPKH
if (dest.type() == typeid(CKeyID) || dest.type() == typeid(WitnessV0KeyHash)) { if (dest.type() == typeid(PKHash) || dest.type() == typeid(WitnessV0KeyHash)) {
if (!allow_p2wpkh && dest.type() == typeid(WitnessV0KeyHash)) { if (!allow_p2wpkh && dest.type() == typeid(WitnessV0KeyHash)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "P2WPKH cannot be embedded in P2WSH"); throw JSONRPCError(RPC_INVALID_PARAMETER, "P2WPKH cannot be embedded in P2WSH");
} }