monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1395

Browse source 
59443bf9 ringct: fix MGs serialization to JSON (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-12-04 22:25:24 +02:00
commit d59dc59744
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ringct/rctTypes.h
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;