Make compressed pubkeys require 0.6.0

This commit is contained in:
Pieter Wuille 2012-02-18 15:06:32 +01:00
parent 9976cf070f
commit 38067c18f8
2 changed files with 9 additions and 2 deletions

View file

@ -114,7 +114,7 @@ public:
return fCompressedPubKey;
}
void MakeNewKey(bool fCompressed = true)
void MakeNewKey(bool fCompressed)
{
if (!EC_KEY_generate_key(pkey))
throw key_error("CKey::MakeNewKey() : EC_KEY_generate_key failed");

View file

@ -17,9 +17,16 @@ using namespace std;
std::vector<unsigned char> CWallet::GenerateNewKey()
{
bool fCompressed = true; // default to compressed public keys
RandAddSeedPerfmon();
CKey key;
key.MakeNewKey();
key.MakeNewKey(fCompressed);
// Compressed public keys were introduced in version 0.6.0
if (fCompressed)
SetMinVersion(59900);
if (!AddKey(key))
throw std::runtime_error("CWallet::GenerateNewKey() : AddKey failed");
return key.GetPubKey();