if (!pcursor)
throw runtime_error("CWalletDB::ListAccountCreditDebit() : cannot create DB cursor");
unsigned int fFlags = DB_SET_RANGE;
- while (true)
+ for ( ; ; )
{
// Read next record
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssValue >> vchSecret;
CMalleableKeyView keyView(strKeyView);
- if (!pwallet->LoadMalleableKey(keyView, vchSecret))
+ if (!pwallet->LoadKey(keyView, vchSecret))
{
- strErr = "Error reading wallet database: LoadMalleableKey failed";
+ strErr = "Error reading wallet database: LoadKey failed";
return false;
}
}
ssValue >> vchCryptedSecret;
CMalleableKeyView keyView(strKeyView);
- if (!pwallet->LoadCryptedMalleableKey(keyView, vchCryptedSecret))
+ if (!pwallet->LoadCryptedKey(keyView, vchCryptedSecret))
{
- strErr = "Error reading wallet database: LoadCryptedMalleableKey failed";
+ strErr = "Error reading wallet database: LoadCryptedKey failed";
return false;
}
}
else if (strType == "key" || strType == "wkey")
{
- vector<unsigned char> vchPubKey;
- ssKey >> vchPubKey;
CKey key;
+ CPubKey vchPubKey;
+ ssKey >> vchPubKey;
if (strType == "key")
{
wss.nKeys++;
CPrivKey pkey;
ssValue >> pkey;
- key.SetPubKey(vchPubKey);
if (!key.SetPrivKey(pkey))
{
strErr = "Error reading wallet database: CPrivKey corrupt";
strErr = "Error reading wallet database: CPrivKey pubkey inconsistency";
return false;
}
+ key.SetCompressedPubKey(vchPubKey.IsCompressed());
if (!key.IsValid())
{
strErr = "Error reading wallet database: invalid CPrivKey";
{
CWalletKey wkey;
ssValue >> wkey;
- key.SetPubKey(vchPubKey);
if (!key.SetPrivKey(wkey.vchPrivKey))
{
strErr = "Error reading wallet database: CPrivKey corrupt";
strErr = "Error reading wallet database: CWalletKey pubkey inconsistency";
return false;
}
+ key.SetCompressedPubKey(vchPubKey.IsCompressed());
if (!key.IsValid())
{
strErr = "Error reading wallet database: invalid CWalletKey";
else if (strType == "ckey")
{
wss.nCKeys++;
- vector<unsigned char> vchPubKey;
+ CPubKey vchPubKey;
ssKey >> vchPubKey;
vector<unsigned char> vchPrivKey;
ssValue >> vchPrivKey;
return DB_CORRUPT;
}
- while (true)
+ for ( ; ; )
{
// Read next record
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
return DB_CORRUPT;
}
- while (true)
+ for ( ; ; )
{
// Read next record
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
}
pcursor->close();
}
- catch (boost::thread_interrupted) {
+ catch (const boost::thread_interrupted&) {
throw;
}
catch (...) {
}
printf("Importing %s...\n", addr.ToString().c_str());
- if (!pwallet->AddMalleableKey(mKey)) {
+ if (!pwallet->AddKey(mKey)) {
fGood = false;
continue;
}