maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change GetMetadata to use unique_ptr<CKeyMetadata>

Browse source
This commit is contained in:
Andrew Chow 2019-11-06 20:55:34 -05:00
parent 72a9540df9
commit 8b9603bd0b
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/rpcwallet.cpp
View file

@ -3820,7 +3820,7 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
ScriptPubKeyMan* spk_man = pwallet->GetScriptPubKeyMan(scriptPubKey); ScriptPubKeyMan* spk_man = pwallet->GetScriptPubKeyMan(scriptPubKey);
if (spk_man) { if (spk_man) {
if (const CKeyMetadata* meta = spk_man->GetMetadata(dest)) { if (const std::unique_ptr<CKeyMetadata> meta = spk_man->GetMetadata(dest)) {
ret.pushKV("timestamp", meta->nCreateTime); ret.pushKV("timestamp", meta->nCreateTime);
if (meta->has_key_origin) { if (meta->has_key_origin) {
ret.pushKV("hdkeypath", WriteHDKeypath(meta->key_origin.path)); ret.pushKV("hdkeypath", WriteHDKeypath(meta->key_origin.path));

8
src/wallet/scriptpubkeyman.cpp
View file

@ -568,7 +568,7 @@ TransactionError LegacyScriptPubKeyMan::FillPSBT(PartiallySignedTransaction& psb
return TransactionError::OK; return TransactionError::OK;
} }
const CKeyMetadata* LegacyScriptPubKeyMan::GetMetadata(const CTxDestination& dest) const std::unique_ptr<CKeyMetadata> LegacyScriptPubKeyMan::GetMetadata(const CTxDestination& dest) const
{ {
LOCK(cs_KeyStore); LOCK(cs_KeyStore);
@ -576,14 +576,14 @@ const CKeyMetadata* LegacyScriptPubKeyMan::GetMetadata(const CTxDestination& des
if (!key_id.IsNull()) { if (!key_id.IsNull()) {
auto it = mapKeyMetadata.find(key_id); auto it = mapKeyMetadata.find(key_id);
if (it != mapKeyMetadata.end()) { if (it != mapKeyMetadata.end()) {
return &it->second; return MakeUnique<CKeyMetadata>(it->second);
} }
} }
CScript scriptPubKey = GetScriptForDestination(dest); CScript scriptPubKey = GetScriptForDestination(dest);
auto it = m_script_metadata.find(CScriptID(scriptPubKey)); auto it = m_script_metadata.find(CScriptID(scriptPubKey));
if (it != m_script_metadata.end()) { if (it != m_script_metadata.end()) {
return &it->second; return MakeUnique<CKeyMetadata>(it->second);
} }
return nullptr; return nullptr;
@ -2041,7 +2041,7 @@ TransactionError DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTransaction&
return TransactionError::OK; return TransactionError::OK;
} }
const CKeyMetadata* DescriptorScriptPubKeyMan::GetMetadata(const CTxDestination& dest) const std::unique_ptr<CKeyMetadata> DescriptorScriptPubKeyMan::GetMetadata(const CTxDestination& dest) const
{ {
return nullptr; return nullptr;
} }

6
src/wallet/scriptpubkeyman.h
View file

@ -205,7 +205,7 @@ public:
virtual int64_t GetTimeFirstKey() const { return 0; } virtual int64_t GetTimeFirstKey() const { return 0; }
virtual const CKeyMetadata* GetMetadata(const CTxDestination& dest) const { return nullptr; } virtual std::unique_ptr<CKeyMetadata> GetMetadata(const CTxDestination& dest) const { return nullptr; }
virtual std::unique_ptr<SigningProvider> GetSolvingProvider(const CScript& script) const { return nullptr; } virtual std::unique_ptr<SigningProvider> GetSolvingProvider(const CScript& script) const { return nullptr; }
@ -355,7 +355,7 @@ public:
int64_t GetTimeFirstKey() const override; int64_t GetTimeFirstKey() const override;
const CKeyMetadata* GetMetadata(const CTxDestination& dest) const override; std::unique_ptr<CKeyMetadata> GetMetadata(const CTxDestination& dest) const override;
bool CanGetAddresses(bool internal = false) const override; bool CanGetAddresses(bool internal = false) const override;
@ -560,7 +560,7 @@ public:
int64_t GetTimeFirstKey() const override; int64_t GetTimeFirstKey() const override;
const CKeyMetadata* GetMetadata(const CTxDestination& dest) const override; std::unique_ptr<CKeyMetadata> GetMetadata(const CTxDestination& dest) const override;
bool CanGetAddresses(bool internal = false) const override; bool CanGetAddresses(bool internal = false) const override;