diff options
| author | Gavin Andresen <[email protected]> | 2013-08-22 01:54:28 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-08-22 01:54:28 -0700 |
| commit | e62f8d72f349aec0865268c089ae99fedd314af1 (patch) | |
| tree | 7735f34781f1ced27553b202bceaa74048018636 /src/rpcdump.cpp | |
| parent | Merge pull request #2922 from Diapolo/translations (diff) | |
| parent | Payment Protocol: X509-validated payment requests (diff) | |
| download | discoin-e62f8d72f349aec0865268c089ae99fedd314af1.tar.xz discoin-e62f8d72f349aec0865268c089ae99fedd314af1.zip | |
Merge pull request #2539 from gavinandresen/paymentrequest
Payment Protocol Work
Diffstat (limited to 'src/rpcdump.cpp')
| -rw-r--r-- | src/rpcdump.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index dcfb023f3..e166f76bf 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -94,7 +94,7 @@ Value importprivkey(const Array& params, bool fHelp) LOCK2(cs_main, pwalletMain->cs_wallet); pwalletMain->MarkDirty(); - pwalletMain->SetAddressBookName(vchAddress, strLabel); + pwalletMain->SetAddressBook(vchAddress, strLabel, "receive"); // Don't throw error in case a key is already there if (pwalletMain->HaveKey(vchAddress)) @@ -172,7 +172,7 @@ Value importwallet(const Array& params, bool fHelp) } pwalletMain->mapKeyMetadata[keyid].nCreateTime = nTime; if (fLabel) - pwalletMain->SetAddressBookName(keyid, strLabel); + pwalletMain->SetAddressBook(keyid, strLabel, "receive"); nTimeBegin = std::min(nTimeBegin, nTime); } file.close(); @@ -255,7 +255,7 @@ Value dumpwallet(const Array& params, bool fHelp) CKey key; if (pwalletMain->GetKey(keyid, key)) { if (pwalletMain->mapAddressBook.count(keyid)) { - file << strprintf("%s %s label=%s # addr=%s\n", CBitcoinSecret(key).ToString().c_str(), strTime.c_str(), EncodeDumpString(pwalletMain->mapAddressBook[keyid]).c_str(), strAddr.c_str()); + file << strprintf("%s %s label=%s # addr=%s\n", CBitcoinSecret(key).ToString().c_str(), strTime.c_str(), EncodeDumpString(pwalletMain->mapAddressBook[keyid].name).c_str(), strAddr.c_str()); } else if (setKeyPool.count(keyid)) { file << strprintf("%s %s reserve=1 # addr=%s\n", CBitcoinSecret(key).ToString().c_str(), strTime.c_str(), strAddr.c_str()); } else { |