X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fwalletdb.cpp;h=c8e64ca6bff2c756dd3dd0fc636d05e58904aa8c;hb=15e9a03687e99d6b1a7a90e56e69a37faa6bb9b8;hp=c9e187d75f354ed186979a24440ad2d6cddfb87b;hpb=ab0e30c40cc589661ceb4f0d09c9373ecaefc3a9;p=novacoin.git

diff --git a/src/walletdb.cpp b/src/walletdb.cpp
index c9e187d..c8e64ca 100644
--- a/src/walletdb.cpp
+++ b/src/walletdb.cpp
@@ -818,51 +818,33 @@ bool DumpWallet(CWallet* pwallet, const string& strDest)
         const CBitcoinAddress &addr = it->second;
         std::string strTime = EncodeDumpTime(it->first);
         std::string strAddr = addr.ToString();
-        bool IsCompressed;
 
         if (addr.IsPair()) {
             // Pubkey pair address
             CMalleableKeyView keyView;
             CMalleablePubKey mPubKey(addr.GetData());
-            if (pwallet->GetMalleableView(mPubKey, keyView)) {
-                CMalleableKey mKey;
-                pwallet->GetMalleableKey(keyView, mKey);
-
-                file << strprintf("%s %s # addr=%s view=%s\n",
-                                  mKey.ToString().c_str(),
-                                  strTime.c_str(),
-                                  strAddr.c_str(),
-                                  keyView.ToString().c_str());
-            }
+            if (!pwallet->GetMalleableView(mPubKey, keyView))
+                continue;
+            CMalleableKey mKey;
+            pwallet->GetMalleableKey(keyView, mKey);
+            file << strprintf("%s %s # view=%s addr=%s\n", mKey.ToString().c_str(), strTime.c_str(), keyView.ToString().c_str(), strAddr.c_str());
         }
         else {
             // Pubkey hash address
             CKeyID keyid;
             addr.GetKeyID(keyid);
-
+            bool IsCompressed;
             CKey key;
-            if (pwallet->GetKey(keyid, key)) {
-                if (pwallet->mapAddressBook.count(keyid)) {
-                    CSecret secret = key.GetSecret(IsCompressed);
-                    file << strprintf("%s %s label=%s # addr=%s\n",
-                                      CBitcoinSecret(secret, IsCompressed).ToString().c_str(),
-                                      strTime.c_str(),
-                                      EncodeDumpString(pwallet->mapAddressBook[keyid]).c_str(),
-                                      strAddr.c_str());
-                } else if (setKeyPool.count(keyid)) {
-                    CSecret secret = key.GetSecret(IsCompressed);
-                    file << strprintf("%s %s reserve=1 # addr=%s\n",
-                                      CBitcoinSecret(secret, IsCompressed).ToString().c_str(),
-                                      strTime.c_str(),
-                                      strAddr.c_str());
-                } else {
-                    CSecret secret = key.GetSecret(IsCompressed);
-                    file << strprintf("%s %s change=1 # addr=%s\n",
-                                      CBitcoinSecret(secret, IsCompressed).ToString().c_str(),
-                                      strTime.c_str(),
-                                      strAddr.c_str());
-                }
-            }
+            if (!pwallet->GetKey(keyid, key))
+                continue;
+            CSecret secret = key.GetSecret(IsCompressed);
+            file << CBitcoinSecret(secret, IsCompressed).ToString();
+            if (pwallet->mapAddressBook.count(keyid))
+                file << strprintf(" %s label=%s # addr=%s\n", strTime.c_str(), EncodeDumpString(pwallet->mapAddressBook[keyid]).c_str(), strAddr.c_str());
+            else if (setKeyPool.count(keyid))
+                file << strprintf(" %s reserve=1 # addr=%s\n", strTime.c_str(), strAddr.c_str());
+            else
+                file << strprintf(" %s change=1 # addr=%s\n", strTime.c_str(), strAddr.c_str());
         }
     }
 
@@ -878,89 +860,103 @@ bool ImportWallet(CWallet *pwallet, const string& strLocation)
 
    if (!pwallet->fFileBacked)
        return false;
-   while (!fShutdown)
-   {
-      // open inputfile as stream
-      ifstream file;
-      file.open(strLocation.c_str());
-      if (!file.is_open())
-          return false;
-
-      int64_t nTimeBegin = pindexBest->nTime;
-
-      bool fGood = true;
-
-      // read through input file checking and importing keys into wallet.
-      while (file.good()) {
-          std::string line;
-          std::getline(file, line);
-          if (line.empty() || line[0] == '#')
-              continue;
-
-          std::vector<std::string> vstr;
-          istringstream iss(line);
-          copy(istream_iterator<string>(iss), istream_iterator<string>(), back_inserter(vstr));
-          if (vstr.size() < 2)
-              continue;
-          CBitcoinSecret vchSecret;
-          if (!vchSecret.SetString(vstr[0]))
-              continue;
-
-          bool fCompressed;
-          CKey key;
-          CSecret secret = vchSecret.GetSecret(fCompressed);
-          key.SetSecret(secret, fCompressed);
-          CKeyID keyid = key.GetPubKey().GetID();
-
-          if (pwallet->HaveKey(keyid)) {
-              printf("Skipping import of %s (key already present)\n", CBitcoinAddress(keyid).ToString().c_str());
-             continue;
-          }
-          int64_t nTime = DecodeDumpTime(vstr[1]);
-          std::string strLabel;
-          bool fLabel = true;
-          for (unsigned int nStr = 2; nStr < vstr.size(); nStr++) {
-              if (boost::algorithm::starts_with(vstr[nStr], "#"))
-                  break;
-              if (vstr[nStr] == "change=1")
-                  fLabel = false;
-              if (vstr[nStr] == "reserve=1")
-                  fLabel = false;
-              if (boost::algorithm::starts_with(vstr[nStr], "label=")) {
-                  strLabel = DecodeDumpString(vstr[nStr].substr(6));
-                  fLabel = true;
-              }
-          }
-          printf("Importing %s...\n", CBitcoinAddress(keyid).ToString().c_str());
-          if (!pwallet->AddKey(key)) {
-              fGood = false;
-              continue;
-          }
-          pwallet->mapKeyMetadata[keyid].nCreateTime = nTime;
-          if (fLabel)
-              pwallet->SetAddressBookName(keyid, strLabel);
-          nTimeBegin = std::min(nTimeBegin, nTime);
-      }
-      file.close();
-
-      // rescan block chain looking for coins from new keys
-      CBlockIndex *pindex = pindexBest;
-      while (pindex && pindex->pprev && pindex->nTime > nTimeBegin - 7200)
-          pindex = pindex->pprev;
-
-      printf("Rescanning last %i blocks\n", pindexBest->nHeight - pindex->nHeight + 1);
-      pwallet->ScanForWalletTransactions(pindex);
-      pwallet->ReacceptWalletTransactions();
-      pwallet->MarkDirty();
-
-      return fGood;
-
-  }
-
-  return false;
 
-}
+   // open inputfile as stream
+   ifstream file;
+   file.open(strLocation.c_str());
+   if (!file.is_open())
+       return false;
 
+   bool fGood = true;
+   int64_t nTimeBegin = pindexBest->nTime;
+
+   // read through input file checking and importing keys into wallet.
+   while (file.good()) {
+       std::string line;
+       std::getline(file, line);
+       if (line.empty() || line[0] == '#')
+           continue; // Skip comments and empty lines
+
+       std::vector<std::string> vstr;
+       istringstream iss(line);
+       copy(istream_iterator<string>(iss), istream_iterator<string>(), back_inserter(vstr));
+       if (vstr.size() < 2)
+           continue;
+
+       int64_t nTime = DecodeDumpTime(vstr[1]);
+       std::string strLabel;
+       bool fLabel = true;
+       for (unsigned int nStr = 2; nStr < vstr.size(); nStr++) {
+           if (boost::algorithm::starts_with(vstr[nStr], "#"))
+               break;
+           if (vstr[nStr] == "change=1")
+               fLabel = false;
+           if (vstr[nStr] == "reserve=1")
+               fLabel = false;
+           if (boost::algorithm::starts_with(vstr[nStr], "label=")) {
+               strLabel = DecodeDumpString(vstr[nStr].substr(6));
+               fLabel = true;
+           }
+       }
+
+       CBitcoinSecret vchSecret;
+       if (vchSecret.SetString(vstr[0])) {
+           // Simple private key
+
+           bool fCompressed;
+           CKey key;
+           CSecret secret = vchSecret.GetSecret(fCompressed);
+           key.SetSecret(secret, fCompressed);
+           CKeyID keyid = key.GetPubKey().GetID();
+
+           if (pwallet->HaveKey(keyid)) {
+               printf("Skipping import of %s (key already present)\n", CBitcoinAddress(keyid).ToString().c_str());
+               continue;
+           }
+
+           printf("Importing %s...\n", CBitcoinAddress(keyid).ToString().c_str());
+           if (!pwallet->AddKey(key)) {
+               fGood = false;
+               continue;
+           }
+           pwallet->mapKeyMetadata[keyid].nCreateTime = nTime;
+           if (fLabel)
+               pwallet->SetAddressBookName(keyid, strLabel);
+       } else {
+           // A pair of private keys
+
+           CMalleableKey mKey;
+           if (!mKey.SetString(vstr[0]))
+               continue;
+           CMalleablePubKey mPubKey = mKey.GetMalleablePubKey();
+           if (pwallet->CheckOwnership(mPubKey)) {
+               printf("Skipping import of %s (key already present)\n", CBitcoinAddress(mPubKey).ToString().c_str());
+               continue;
+           }
+
+           printf("Importing %s...\n", CBitcoinAddress(mPubKey).ToString().c_str());
+           if (!pwallet->AddMalleableKey(mKey)) {
+               fGood = false;
+               continue;
+           }
+           pwallet->mapMalleableKeyMetadata[CMalleableKeyView(mKey)].nCreateTime = nTime;
+       }
+       nTimeBegin = std::min(nTimeBegin, nTime);
+   }
+   file.close();
+
+   // rescan block chain looking for coins from new keys
+   CBlockIndex *pindex = pindexBest;
+   while (pindex && pindex->pprev && pindex->nTime > nTimeBegin - 7200)
+       pindex = pindex->pprev;
+
+   printf("Rescanning last %i blocks\n", pindexBest->nHeight - pindex->nHeight + 1);
+   pwallet->ScanForWalletTransactions(pindex);
+   pwallet->ReacceptWalletTransactions();
+   pwallet->MarkDirty();
+
+   return fGood;
+}
 
 //
 // Try to (very carefully!) recover wallet.dat if there is a problem.