rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-22 15:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9377

Browse source 
e875a58 Fix ZMQ Tx Pruning (Lee Clagett)
This commit is contained in:
luigi1111 2024-07-16 18:57:35 -04:00
commit 61db6497f7
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/serialization/json_object.cpp
View file

@ -273,7 +273,10 @@ void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const cryptonote::t
{ {
INSERT_INTO_JSON_OBJECT(dest, signatures, tx.signatures); INSERT_INTO_JSON_OBJECT(dest, signatures, tx.signatures);
} }
INSERT_INTO_JSON_OBJECT(dest, ringct, tx.rct_signatures); {
dest.Key("ringct");
toJsonValue(dest, tx.rct_signatures, tx.pruned);
}
dest.EndObject(); dest.EndObject();
} }
@ -1111,7 +1114,7 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::rpc::BlockHeaderResp
GET_FROM_JSON_OBJECT(val, response.reward, reward); GET_FROM_JSON_OBJECT(val, response.reward, reward);
} }
void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const rct::rctSig& sig) void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const rct::rctSig& sig, const bool prune)
{ {
using boost::adaptors::transform; using boost::adaptors::transform;
@ -1131,7 +1134,7 @@ void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const rct::rctSig&
} }
// prunable // prunable
if (!sig.p.bulletproofs.empty() || !sig.p.bulletproofs_plus.empty() || !sig.p.rangeSigs.empty() || !sig.p.MGs.empty() || !sig.get_pseudo_outs().empty()) if (!prune && (!sig.p.bulletproofs.empty() || !sig.p.bulletproofs_plus.empty() || !sig.p.rangeSigs.empty() || !sig.p.MGs.empty() || !sig.get_pseudo_outs().empty()))
{ {
dest.Key("prunable"); dest.Key("prunable");
dest.StartObject(); dest.StartObject();

2
src/serialization/json_object.h
View file

@ -281,7 +281,7 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::rpc::error& error);
void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const cryptonote::rpc::BlockHeaderResponse& response); void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const cryptonote::rpc::BlockHeaderResponse& response);
void fromJsonValue(const rapidjson::Value& val, cryptonote::rpc::BlockHeaderResponse& response); void fromJsonValue(const rapidjson::Value& val, cryptonote::rpc::BlockHeaderResponse& response);
void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const rct::rctSig& i); void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const rct::rctSig& sig, bool prune);
void fromJsonValue(const rapidjson::Value& val, rct::rctSig& sig); void fromJsonValue(const rapidjson::Value& val, rct::rctSig& sig);
void fromJsonValue(const rapidjson::Value& val, rct::ctkey& key); void fromJsonValue(const rapidjson::Value& val, rct::ctkey& key);