mirror of
https://github.com/monero-project/monero.git
synced 2024-12-23 12:09:54 +00:00
Merge pull request #7801
07d82af
Fixed json serialization of rct::RCTTypeNull (SChernykh)
This commit is contained in:
commit
db6688f584
1 changed files with 12 additions and 6 deletions
|
@ -1091,9 +1091,12 @@ void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const rct::rctSig&
|
||||||
};
|
};
|
||||||
|
|
||||||
INSERT_INTO_JSON_OBJECT(dest, type, sig.type);
|
INSERT_INTO_JSON_OBJECT(dest, type, sig.type);
|
||||||
|
if (sig.type != rct::RCTTypeNull)
|
||||||
|
{
|
||||||
INSERT_INTO_JSON_OBJECT(dest, encrypted, sig.ecdhInfo);
|
INSERT_INTO_JSON_OBJECT(dest, encrypted, sig.ecdhInfo);
|
||||||
INSERT_INTO_JSON_OBJECT(dest, commitments, transform(sig.outPk, just_mask));
|
INSERT_INTO_JSON_OBJECT(dest, commitments, transform(sig.outPk, just_mask));
|
||||||
INSERT_INTO_JSON_OBJECT(dest, fee, sig.txnFee);
|
INSERT_INTO_JSON_OBJECT(dest, fee, sig.txnFee);
|
||||||
|
}
|
||||||
|
|
||||||
// prunable
|
// prunable
|
||||||
if (!sig.p.bulletproofs.empty() || !sig.p.rangeSigs.empty() || !sig.p.MGs.empty() || !sig.get_pseudo_outs().empty())
|
if (!sig.p.bulletproofs.empty() || !sig.p.rangeSigs.empty() || !sig.p.MGs.empty() || !sig.get_pseudo_outs().empty())
|
||||||
|
@ -1122,9 +1125,12 @@ void fromJsonValue(const rapidjson::Value& val, rct::rctSig& sig)
|
||||||
}
|
}
|
||||||
|
|
||||||
GET_FROM_JSON_OBJECT(val, sig.type, type);
|
GET_FROM_JSON_OBJECT(val, sig.type, type);
|
||||||
|
if (sig.type != rct::RCTTypeNull)
|
||||||
|
{
|
||||||
GET_FROM_JSON_OBJECT(val, sig.ecdhInfo, encrypted);
|
GET_FROM_JSON_OBJECT(val, sig.ecdhInfo, encrypted);
|
||||||
GET_FROM_JSON_OBJECT(val, sig.outPk, commitments);
|
GET_FROM_JSON_OBJECT(val, sig.outPk, commitments);
|
||||||
GET_FROM_JSON_OBJECT(val, sig.txnFee, fee);
|
GET_FROM_JSON_OBJECT(val, sig.txnFee, fee);
|
||||||
|
}
|
||||||
|
|
||||||
// prunable
|
// prunable
|
||||||
const auto prunable = val.FindMember("prunable");
|
const auto prunable = val.FindMember("prunable");
|
||||||
|
|
Loading…
Reference in a new issue