|
|
@ -73,9 +73,13 @@ public: |
|
|
|
class CKeyMetadata |
|
|
|
class CKeyMetadata |
|
|
|
{ |
|
|
|
{ |
|
|
|
public: |
|
|
|
public: |
|
|
|
static const int CURRENT_VERSION=1; |
|
|
|
static const int VERSION_BASIC=1; |
|
|
|
|
|
|
|
static const int VERSION_WITH_HDDATA=10; |
|
|
|
|
|
|
|
static const int CURRENT_VERSION=VERSION_WITH_HDDATA; |
|
|
|
int nVersion; |
|
|
|
int nVersion; |
|
|
|
int64_t nCreateTime; // 0 means unknown
|
|
|
|
int64_t nCreateTime; // 0 means unknown
|
|
|
|
|
|
|
|
std::string hdKeypath; //optional HD/bip32 keypath
|
|
|
|
|
|
|
|
CKeyID hdMasterKeyID; //id of the hd masterkey used to derive this key
|
|
|
|
|
|
|
|
|
|
|
|
CKeyMetadata() |
|
|
|
CKeyMetadata() |
|
|
|
{ |
|
|
|
{ |
|
|
@ -85,6 +89,7 @@ public: |
|
|
|
{ |
|
|
|
{ |
|
|
|
nVersion = CKeyMetadata::CURRENT_VERSION; |
|
|
|
nVersion = CKeyMetadata::CURRENT_VERSION; |
|
|
|
nCreateTime = nCreateTime_; |
|
|
|
nCreateTime = nCreateTime_; |
|
|
|
|
|
|
|
hdKeypath.clear(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ADD_SERIALIZE_METHODS; |
|
|
|
ADD_SERIALIZE_METHODS; |
|
|
@ -94,12 +99,18 @@ public: |
|
|
|
READWRITE(this->nVersion); |
|
|
|
READWRITE(this->nVersion); |
|
|
|
nVersion = this->nVersion; |
|
|
|
nVersion = this->nVersion; |
|
|
|
READWRITE(nCreateTime); |
|
|
|
READWRITE(nCreateTime); |
|
|
|
|
|
|
|
if (this->nVersion >= VERSION_WITH_HDDATA) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
READWRITE(hdKeypath); |
|
|
|
|
|
|
|
READWRITE(hdMasterKeyID); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void SetNull() |
|
|
|
void SetNull() |
|
|
|
{ |
|
|
|
{ |
|
|
|
nVersion = CKeyMetadata::CURRENT_VERSION; |
|
|
|
nVersion = CKeyMetadata::CURRENT_VERSION; |
|
|
|
nCreateTime = 0; |
|
|
|
nCreateTime = 0; |
|
|
|
|
|
|
|
hdKeypath.clear(); |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|