diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/script/signingprovider.cpp | 4 | ||||
-rw-r--r-- | src/script/standard.cpp | 5 | ||||
-rw-r--r-- | src/script/standard.h | 1 | ||||
-rw-r--r-- | src/wallet/rpcwallet.cpp | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/script/signingprovider.cpp b/src/script/signingprovider.cpp index a4eb0a8399..2d8dc7d471 100644 --- a/src/script/signingprovider.cpp +++ b/src/script/signingprovider.cpp @@ -183,7 +183,7 @@ CKeyID GetKeyForDestination(const SigningProvider& store, const CTxDestination& return ToKeyID(*id); } if (auto witness_id = boost::get<WitnessV0KeyHash>(&dest)) { - return CKeyID(*witness_id); + return ToKeyID(*witness_id); } if (auto script_hash = boost::get<ScriptHash>(&dest)) { CScript script; @@ -191,7 +191,7 @@ CKeyID GetKeyForDestination(const SigningProvider& store, const CTxDestination& CTxDestination inner_dest; if (store.GetCScript(script_id, script) && ExtractDestination(script, inner_dest)) { if (auto inner_witness_id = boost::get<WitnessV0KeyHash>(&inner_dest)) { - return CKeyID(*inner_witness_id); + return ToKeyID(*inner_witness_id); } } } diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 4b408d82e3..a47ccef842 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -28,6 +28,11 @@ CKeyID ToKeyID(const PKHash& key_hash) return CKeyID{static_cast<uint160>(key_hash)}; } +CKeyID ToKeyID(const WitnessV0KeyHash& key_hash) +{ + return CKeyID{static_cast<uint160>(key_hash)}; +} + WitnessV0ScriptHash::WitnessV0ScriptHash(const CScript& in) { CSHA256().Write(in.data(), in.size()).Finalize(begin()); diff --git a/src/script/standard.h b/src/script/standard.h index 1c630744be..6c882e92a1 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -106,6 +106,7 @@ struct WitnessV0KeyHash : public uint160 explicit WitnessV0KeyHash(const uint160& hash) : uint160(hash) {} explicit WitnessV0KeyHash(const CPubKey& pubkey); }; +CKeyID ToKeyID(const WitnessV0KeyHash& key_hash); //! CTxDestination subtype to encode any future Witness version struct WitnessUnknown diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 43c1aa1a7d..fb79e06538 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3542,7 +3542,7 @@ public: { UniValue obj(UniValue::VOBJ); CPubKey pubkey; - if (provider && provider->GetPubKey(CKeyID(id), pubkey)) { + if (provider && provider->GetPubKey(ToKeyID(id), pubkey)) { obj.pushKV("pubkey", HexStr(pubkey)); } return obj; |