aboutsummaryrefslogtreecommitdiff
path: root/src/serialization/json_object.cpp
diff options
context:
space:
mode:
authorLee Clagett <code@leeclagett.com>2024-06-18 21:26:28 -0400
committerLee Clagett <code@leeclagett.com>2024-06-21 21:37:31 -0400
commite875a587e26c7525134135293277de69ca28932b (patch)
tree08f53b5ccfa4d9d8823a42912dbdc82dfe8a05ac /src/serialization/json_object.cpp
parent24ccaba6ef429fdd37a3281c586e655987201a5c (diff)
downloadmonzero-core-e875a587e26c7525134135293277de69ca28932b.tar.gz
monzero-core-e875a587e26c7525134135293277de69ca28932b.tar.xz
monzero-core-e875a587e26c7525134135293277de69ca28932b.zip
Fix ZMQ Tx Pruning
Diffstat (limited to 'src/serialization/json_object.cpp')
-rw-r--r--src/serialization/json_object.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/serialization/json_object.cpp b/src/serialization/json_object.cpp
index 43d9cfebe..628f41c52 100644
--- a/src/serialization/json_object.cpp
+++ b/src/serialization/json_object.cpp
@@ -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, ringct, tx.rct_signatures);
+ {
+ dest.Key("ringct");
+ toJsonValue(dest, tx.rct_signatures, tx.pruned);
+ }
dest.EndObject();
}
@@ -1111,7 +1114,7 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::rpc::BlockHeaderResp
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;
@@ -1131,7 +1134,7 @@ void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const rct::rctSig&
}
// 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.StartObject();