X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fkey.h;fp=src%2Fkey.h;h=ca78c724e8a273c1dddc5e6e2ea051a1ca65cc87;hp=f8404db83b5c0dab31d9abdba2cf38a98e45536e;hb=e5e4c598dc43bb5e01b3a30aaeb2dfc9376bd7b4;hpb=bd4a1340b19f76cbb4e0507a30621d0be37394af diff --git a/src/key.h b/src/key.h index f8404db..ca78c72 100644 --- a/src/key.h +++ b/src/key.h @@ -277,7 +277,6 @@ public: void GetSecrets(CSecret &pvchSecretL, CSecret &pvchSecretH) const; CMalleablePubKey GetMalleablePubKey() const; - bool CheckKeyVariant(const CPubKey &R, const CPubKey &vchPubKeyVariant); bool CheckKeyVariant(const CPubKey &R, const CPubKey &vchPubKeyVariant, CKey &privKeyVariant); }; @@ -285,15 +284,14 @@ public: class CMalleableKeyView { private: + unsigned char nVersion; CSecret vchSecretL; std::vector vchPubKeyH; - // disabled constructor - CMalleableKeyView() { }; - static const unsigned char CURRENT_VERSION = 1; public: + CMalleableKeyView() { nVersion = 0; }; CMalleableKeyView(const CMalleableKey &b); CMalleableKeyView(const CSecret &L, const CPubKey &pvchPubKeyH); @@ -301,8 +299,19 @@ public: CMalleableKeyView& operator=(const CMalleableKey &b); ~CMalleableKeyView(); - CMalleablePubKey GetMalleablePubKey() const; + IMPLEMENT_SERIALIZE( + READWRITE(this->nVersion); + nVersion = this->nVersion; + READWRITE(vchSecretL); + READWRITE(vchPubKeyH); + ) + + bool IsNull() const; + std::string ToString(); + bool SetString(const std::string& strMalleablePubKey); + + CMalleablePubKey GetMalleablePubKey() const; bool CheckKeyVariant(const CPubKey &R, const CPubKey &vchPubKeyVariant); };