Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

serialization fixes from predevelop

Browse source
This commit is contained in:
sowle 2020-05-07 14:57:45 +03:00
parent 6f710f8b62
commit a41d73cf8e
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/currency_core/account.h
View file

@ -35,9 +35,9 @@ namespace currency
crypto::secret_key view_secret_key;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(account_address)
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(spend_secret_key)
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(view_secret_key)
KV_SERIALIZE_N(account_address, "m_account_address")
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(spend_secret_key, "m_spend_secret_key")
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(view_secret_key, "m_view_secret_key")
END_KV_SERIALIZE_MAP()
};

9
src/currency_core/currency_basic.h
View file

@ -71,8 +71,8 @@ namespace currency
END_SERIALIZE()
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(spend_public_key)
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(view_public_key)
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(spend_public_key, "m_spend_public_key")
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(view_public_key, "m_view_public_key")
END_KV_SERIALIZE_MAP()
};
#pragma pack(pop)
@ -88,23 +88,18 @@ namespace currency
{
crypto::public_key spend_public_key;
crypto::public_key view_public_key;
//uint8_t version;
uint8_t flags;
DEFINE_SERIALIZATION_VERSION(ACCOUNT_PUBLIC_ADDRESS_SERIZALIZATION_VER)
BEGIN_SERIALIZE_OBJECT()
FIELD(spend_public_key)
FIELD(view_public_key)
//VERSION_ENTRY(version)
FIELD(flags)
//if (version > ACCOUNT_PUBLIC_ADDRESS_SERIZALIZATION_VER)
// return true; // backward compartibility
END_SERIALIZE()
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(spend_public_key)
KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(view_public_key)
//KV_SERIALIZE(version) // is it necessary?
KV_SERIALIZE(flags)
END_KV_SERIALIZE_MAP()