diff options
| author | John Newbery <john@johnnewbery.com> | 2017-07-21 13:54:13 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2017-08-04 11:08:39 -0400 |
| commit | f2123e3a7bf30545967b9ceb37961976cf7d64fb (patch) | |
| tree | b1d4d6e0091ca4a7b386b097b98e7db9cfdf5e5a /src/wallet/rpcdump.cpp | |
| parent | 83f1ec33ceff1245a44a24aa8a2840e1fd43e431 (diff) | |
| download | bitcoin-f2123e3a7bf30545967b9ceb37961976cf7d64fb.tar.xz | |
[wallet] Cache keyid -> keypool id mappings
Diffstat (limited to 'src/wallet/rpcdump.cpp')
| -rw-r--r-- | src/wallet/rpcdump.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 5abf32480a..67c6d9ec64 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -619,9 +619,8 @@ UniValue dumpwallet(const JSONRPCRequest& request) throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file"); std::map<CTxDestination, int64_t> mapKeyBirth; - std::set<CKeyID> setKeyPool; + const std::map<CKeyID, int64_t>& mapKeyPool = pwallet->GetAllReserveKeys(); pwallet->GetKeyBirthTimes(mapKeyBirth); - pwallet->GetAllReserveKeys(setKeyPool); // sort time/key pairs std::vector<std::pair<int64_t, CKeyID> > vKeyBirth; @@ -666,7 +665,7 @@ UniValue dumpwallet(const JSONRPCRequest& request) file << strprintf("label=%s", EncodeDumpString(pwallet->mapAddressBook[keyid].name)); } else if (keyid == masterKeyID) { file << "hdmaster=1"; - } else if (setKeyPool.count(keyid)) { + } else if (mapKeyPool.count(keyid)) { file << "reserve=1"; } else if (pwallet->mapKeyMetadata[keyid].hdKeypath == "m") { file << "inactivehdmaster=1"; |