ringct: fix MGs serialization to JSON

This commit is contained in:
moneromooo-monero 2016-12-02 13:15:30 +00:00
parent c36cb54340
commit 59443bf9df
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 5 additions and 1 deletions

View File

@ -281,6 +281,7 @@ namespace rct {
// we save the MGs contents directly, because we want it to save its // we save the MGs contents directly, because we want it to save its
// arrays and matrices without the size prefixes, and the load can't // arrays and matrices without the size prefixes, and the load can't
// know what size to expect if it's not in the data // know what size to expect if it's not in the data
ar.begin_object();
ar.tag("ss"); ar.tag("ss");
ar.begin_array(); ar.begin_array();
PREPARE_CUSTOM_VECTOR_SERIALIZATION(mixin + 1, MGs[i].ss); PREPARE_CUSTOM_VECTOR_SERIALIZATION(mixin + 1, MGs[i].ss);
@ -296,7 +297,7 @@ namespace rct {
for (size_t k = 0; k < mg_ss2_elements; ++k) for (size_t k = 0; k < mg_ss2_elements; ++k)
{ {
FIELDS(MGs[i].ss[j][k]) FIELDS(MGs[i].ss[j][k])
if (mg_ss2_elements - j > 1) if (mg_ss2_elements - k > 1)
ar.delimit_array(); ar.delimit_array();
} }
ar.end_array(); ar.end_array();
@ -306,10 +307,13 @@ namespace rct {
} }
ar.end_array(); ar.end_array();
ar.tag("cc");
FIELDS(MGs[i].cc) FIELDS(MGs[i].cc)
// MGs[i].II not saved, it can be reconstructed // MGs[i].II not saved, it can be reconstructed
if (mg_elements - i > 1) if (mg_elements - i > 1)
ar.delimit_array(); ar.delimit_array();
ar.end_object();
} }
ar.end_array(); ar.end_array();
return true; return true;