diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2019-04-04 12:45:32 -0700 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2019-04-16 19:34:22 +1200 |
| commit | 7fcbe7dc112b3d35a5066e6d181f286fb630f744 (patch) | |
| tree | c4c33b4ec32fac6995ce3cb1a4159e7614a14118 /src/wallet | |
| parent | 164082c822b0de0a66ff702397c1588a8dc3a257 (diff) | |
| download | bitcoin-7fcbe7dc112b3d35a5066e6d181f286fb630f744.tar.xz | |
Keep full pubkeys in FlatSigningProvider::origins
Github-Pull: #15749
Rebased-From: 9a93c91c882265c908ea18496cd1bc271be914d4
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/rpcdump.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index bdf901dee4..779dcaf061 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -896,7 +896,7 @@ struct ImportData // Output data std::set<CScript> import_scripts; std::map<CKeyID, bool> used_keys; //!< Import these private keys if available (the value indicates whether if the key is required for solvability) - std::map<CKeyID, KeyOriginInfo> key_origins; + std::map<CKeyID, std::pair<CPubKey, KeyOriginInfo>> key_origins; }; enum class ScriptContext @@ -1283,7 +1283,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con } const auto& key_orig_it = import_data.key_origins.find(id); if (key_orig_it != import_data.key_origins.end()) { - pwallet->AddKeyOrigin(pubkey, key_orig_it->second); + pwallet->AddKeyOrigin(pubkey, key_orig_it->second.second); } pwallet->mapKeyMetadata[id].nCreateTime = timestamp; |